No description
  • C 98.2%
  • Assembly 1%
  • Makefile 0.3%
  • Shell 0.2%
  • Python 0.1%
Find a file
Repository files (latest commit first)
Filename Latest commit message Latest commit date
Rob Herring 85d29c4d6e UPSTREAM: amba: Retry adding deferred devices at late_initcall
If amba bus devices defer when adding, the amba bus code simply retries
adding the devices every 5 seconds. This doesn't work well as it
completely unsynchronized with starting the init process which can
happen in less than 5 secs. Add a retry during late_initcall. If the
amba devices are added, then deferred probe takes over. If the
dependencies have not probed at this point, then there's no improvement
over previous behavior. To completely solve this, we'd need to retry
after every successful probe as deferred probe does.

The list_empty() check now happens outside the mutex, but the mutex
wasn't necessary in the first place.

This needed to use deferred probe instead of fragile initcall ordering
on 32-bit VExpress systems where the apb_pclk has a number of probe
dependencies (vexpress-sysregs, vexpress-config).

Cc: John Stultz <john.stultz@linaro.org>
Cc: Saravana Kannan <saravanak@google.com>
Cc: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Russell King <linux@armlinux.org.uk>
Tested-by: Sudeep Holla <sudeep.holla@arm.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Change-Id: Ib5260568396e3beb85baf282c68825da80dad392
(cherry picked from commit 039599c92d3b2e73689e8b6e519d653fd4770abb)
Bug: 160030772
Signed-off-by: Saravana Kannan <saravanak@google.com>
2020-06-27 01:02:29 +00:00
arch This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
block This is the 5.4.48 stable release 2020-06-22 11:43:59 +02:00
certs
crypto This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
Documentation ANDROID: ext4: Handle casefolding with encryption 2020-06-24 22:38:51 +00:00
drivers UPSTREAM: amba: Retry adding deferred devices at late_initcall 2020-06-27 01:02:29 +00:00
fs This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
include ANDROID: GKI: USB: Gadget: add Android ABI padding to struct usb_gadget 2020-06-25 11:00:10 +02:00
init ANDROID: GKI: Enable INTERVAL_TREE 2020-06-26 14:53:44 -07:00
ipc Revert "ANDROID: vfs: Add permission2 for filesystems with per mount permissions" 2020-05-29 14:48:37 +02:00
kernel This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
lib This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
LICENSES
mm This is the 5.4.48 stable release 2020-06-22 11:43:59 +02:00
net This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
samples This is the 5.4.44 stable release 2020-06-04 08:23:35 +02:00
scripts This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
security This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
sound ANDROID: GKI: sound/usb/card.h: add Android ABI padding to struct snd_usb_endpoint 2020-06-25 11:00:10 +02:00
tools This is the 5.4.49 stable release 2020-06-25 07:49:21 +02:00
usr initramfs: restore default compression behavior 2020-04-08 09:08:38 +02:00
virt KVM: arm64: Save the host's PtrAuth keys in non-preemptible context 2020-06-17 16:40:38 +02:00
.clang-format
.cocciconfig
.get_maintainer.ignore
.gitattributes
.gitignore
.mailmap
abi_gki_aarch64.xml ANDROID: GKI: update the abi definitions due to 5.4.49 and padding 2020-06-25 11:26:25 +02:00
abi_gki_aarch64_cuttlefish_whitelist ANDROID: GKI: Update whitelist and defconfig for incfs 2020-06-22 11:43:42 -07:00
abi_gki_aarch64_db845c_whitelist ANDROID: Update kabi for db845c (following moving pinctrl to a module) 2020-06-23 18:55:54 +00:00
abi_gki_aarch64_exynos_whitelist ANDROID: GKI: remove erofs symbols from exported abi 2020-06-09 12:50:42 +02:00
abi_gki_aarch64_goldfish_whitelist ANDROID: GKI: Update whitelist and defconfig for incfs 2020-06-22 11:43:42 -07:00
abi_gki_aarch64_hikey960_whitelist ANDROID: GKI: disable CONFIG_I2C_CHARDEV 2020-06-04 11:59:21 +02:00
abi_gki_aarch64_qcom_whitelist ANDROID: abi_gki_aarch64_qcom_whitelist: Add reboot_mode 2020-06-24 13:50:41 +00:00
abi_gki_aarch64_sunxi_whitelist ANDROID: GKI: remove squashfs-needed symbols from exported abi 2020-06-09 13:21:00 +02:00
abi_gki_aarch64_unisoc_whitelist ANDROID: ABI/Whitelist: update symbols of unisoc whitelist 2020-06-22 11:27:57 +00:00
abi_gki_aarch64_whitelist ANDROID: abi_gki_aarch64_whitelist: add module_layout and task_struct 2020-03-04 23:09:20 +00:00
build.config.aarch64 ANDROID: add compat cross compiler 2020-04-27 20:20:28 -07:00
build.config.allmodconfig ANDROID: fix allmodconfig build to use the right toolchain 2020-04-14 15:39:56 +00:00
build.config.allmodconfig.aarch64
build.config.allmodconfig.arm ANDROID: Add build.config files for ARM 32-bit 2020-03-15 22:51:11 +00:00
build.config.allmodconfig.x86_64
build.config.arm ANDROID: Add build.config files for ARM 32-bit 2020-03-15 22:51:11 +00:00
build.config.common ANDROID: Use depmod from the hermetic toolchain 2020-06-22 12:54:32 +00:00
build.config.db845c ANDROID: db845c build: Use merge_configs 2020-04-01 14:04:53 +00:00
build.config.gki
build.config.gki-debug.aarch64 ANDROID: Fix build.config.gki-debug 2020-05-04 09:11:56 +01:00
build.config.gki-debug.x86_64 ANDROID: Fix build.config.gki-debug 2020-05-04 09:11:56 +01:00
build.config.gki.aarch64 ANDROID: Enforce KMI stability 2020-05-06 12:10:15 +00:00
build.config.gki.x86_64
build.config.gki_kasan ANDROID: Rename build.config.gki.arch_kasan 2020-05-05 20:50:24 +00:00
build.config.gki_kasan.aarch64 ANDROID: Drop ABI monitoring from KASAN build config 2020-05-06 16:43:25 +00:00
build.config.gki_kasan.x86_64 ANDROID: Rename build.config.gki.arch_kasan 2020-05-05 20:50:24 +00:00
build.config.hikey960 ANDROID: hikey960: Add external mali driver support to build.config.hikey960 2020-03-23 22:55:17 +00:00
build.config.x86_64
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS This is the 5.4.23 stable release 2020-03-01 10:17:44 +01:00
Makefile ANDROID: Makefile: append BUILD_NUMBER to version string when defined 2020-06-26 18:42:31 +00:00
README
README.md

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass script/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry-picked from ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
    - then Joe Smith would upload the patch for the common kernel as
        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry-picked from ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [ Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
    - then Joe Smith would upload the patch for the common kernel as
        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)