From d1c2bc974f50320f92ce62bc85b0f74e2be20601 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 1 Jul 2021 19:57:28 -0700 Subject: Kleaf: add bluetooth kernel module. Bug: 192617687 Test: builds Bug: 197995714 Change-Id: I0737ae5e7165bde1d4ad5ca0d5971fc814364865 --- BUILD.bazel | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 BUILD.bazel diff --git a/BUILD.bazel b/BUILD.bazel new file mode 100644 index 0000000..c1342a9 --- /dev/null +++ b/BUILD.bazel @@ -0,0 +1,20 @@ +# NOTE: THIS FILE IS EXPERIMENTAL FOR THE BAZEL MIGRATION AND NOT USED FOR +# YOUR BUILDS CURRENTLY. +# +# It is not yet the source of truth for your build. If you're looking to modify +# the build file, modify the Android.bp file instead. Do *not* modify this file +# unless you have coordinated with the team managing the Soong to Bazel +# migration. + +load("//build/kleaf:kernel.bzl", "kernel_module") + +kernel_module( + name = "broadcom.slider", + outs = [ + "nitrous.ko", + ], + kernel_build = "//private/gs-google:slider", + visibility = [ + "//private/gs-google:__pkg__", + ], +) -- cgit v1.2.3 From 76f45e495a5d1b1b076ffbe25c7a076fcce921e8 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 1 Jul 2021 19:57:28 -0700 Subject: kleaf: Fix module paths for slider. Test: bazel build Bug: 205759526 Change-Id: Iadd20c187051e3654c5a3a89b60240e5cc53aedb --- BUILD.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index c1342a9..f43eaad 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -13,8 +13,8 @@ kernel_module( outs = [ "nitrous.ko", ], - kernel_build = "//private/gs-google:slider", + kernel_build = "//gs/kernel/device-modules:slider", visibility = [ - "//private/gs-google:__pkg__", + "//gs/kernel/device-modules:__pkg__", ], ) -- cgit v1.2.3 From 069c135489f42ea6a316435cdd57975f381cde06 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 17 Nov 2021 10:57:14 -0800 Subject: Update to support gs/kernel/device-modules as an external module * Include the Makefile.include from gs/kernel/device-modules which updates EXTRA_CFLAGS and EXTRA_SYMBOLS to be able to include headers from there as well as link against modules under from there. * Update BUILD.bazel to support these changes as well. Signed-off-by: Will McVicker Change-Id: I72ba9a23e7e204a6689f080095b4eb0c401e9709 --- BUILD.bazel | 10 ++++++++++ Kbuild | 2 -- Makefile | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index f43eaad..f7e9fe4 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -10,10 +10,20 @@ load("//build/kleaf:kernel.bzl", "kernel_module") kernel_module( name = "broadcom.slider", + srcs = glob([ + "**/*.c", + "**/*.h", + "Kbuild", + ]) + [ + "//gs/kernel/device-modules:gs101_soc_headers", + ], outs = [ "nitrous.ko", ], kernel_build = "//gs/kernel/device-modules:slider", + kernel_module_deps = [ + "//gs/kernel/device-modules:gs101_soc", + ], visibility = [ "//gs/kernel/device-modules:__pkg__", ], diff --git a/Kbuild b/Kbuild index 3f61ad5..105c58f 100644 --- a/Kbuild +++ b/Kbuild @@ -1,3 +1 @@ obj-$(CONFIG_NITROUS) := nitrous.o - -ccflags-y += -I$(abspath $(KERNEL_SRC)/$(M)) diff --git a/Makefile b/Makefile index 5a16e0f..ef805c8 100644 --- a/Makefile +++ b/Makefile @@ -3,5 +3,8 @@ M ?= $(shell pwd) KBUILD_OPTIONS := CONFIG_NITROUS=m +include $(KERNEL_SRC)/../gs/kernel/device-modules/Makefile.include + modules modules_install clean: - $(MAKE) -C $(KERNEL_SRC) M=$(M) W=1 $(KBUILD_OPTIONS) $(@) + $(MAKE) -C $(KERNEL_SRC) M=$(M) W=1 \ + $(KBUILD_OPTIONS) EXTRA_CFLAGS="$(EXTRA_CFLAGS)" KBUILD_EXTRA_SYMBOLS="$(EXTRA_SYMBOLS)" $(@) -- cgit v1.2.3 From 24ba4efd42fe88a810b9a265bc5b737498f50f69 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 29 Dec 2021 17:00:59 -0800 Subject: Check return value of kfifo_out This fixes a warning related to not checking functions with the __must_check attribute. Handle the return value appropriately. Bug: 211637748 Signed-off-by: Will McVicker Change-Id: Iebef00a6ee486da71f46612aade2a333ad9c31eb --- nitrous.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nitrous.c b/nitrous.c index 5926738..d6f274d 100644 --- a/nitrous.c +++ b/nitrous.c @@ -247,6 +247,7 @@ static int nitrous_proc_show(struct seq_file *m, void *v) struct nitrous_lpm_proc *data = m->private; struct nitrous_bt_lpm *lpm = data->lpm; ktime_t timestamp; + unsigned int ret; switch (data->operation) { case PROC_BTWAKE: @@ -264,7 +265,11 @@ static int nitrous_proc_show(struct seq_file *m, void *v) (lpm->is_suspended ? "asleep" : "awake")); break; case PROC_TIMESYNC: - kfifo_out(&lpm->timestamp_queue, ×tamp, sizeof(ktime_t)); + ret = kfifo_out(&lpm->timestamp_queue, ×tamp, sizeof(ktime_t)); + if (ret != sizeof(ktime_t)) { + dev_err(lpm->dev, "failed to get the timestamp, ret=%u\n", ret); + return -EINVAL; + } seq_printf(m, "%lld", ktime_to_us(timestamp)); break; default: -- cgit v1.2.3 From 82bfb6475eae344d9d54b46839be5328d82360fc Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 19 Jan 2022 15:20:13 -0800 Subject: Update path for the SoC project The gs/google-modules/soc-modules project holds common include headers, build configs and SoC-specific kernel modules. Signed-off-by: Will McVicker Change-Id: Iff00af2bd66f63f04455c4df5381e8a202061c1b --- BUILD.bazel | 8 ++++---- Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index f7e9fe4..b93162e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -15,16 +15,16 @@ kernel_module( "**/*.h", "Kbuild", ]) + [ - "//gs/kernel/device-modules:gs101_soc_headers", + "//gs/google-modules/soc-modules:gs101_soc_headers", ], outs = [ "nitrous.ko", ], - kernel_build = "//gs/kernel/device-modules:slider", + kernel_build = "//gs/google-modules/soc-modules:slider", kernel_module_deps = [ - "//gs/kernel/device-modules:gs101_soc", + "//gs/google-modules/soc-modules:gs101_soc", ], visibility = [ - "//gs/kernel/device-modules:__pkg__", + "//gs/google-modules/soc-modules:__pkg__", ], ) diff --git a/Makefile b/Makefile index ef805c8..12ff51e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ M ?= $(shell pwd) KBUILD_OPTIONS := CONFIG_NITROUS=m -include $(KERNEL_SRC)/../gs/kernel/device-modules/Makefile.include +include $(KERNEL_SRC)/../gs/google-modules/soc-modules/Makefile.include modules modules_install clean: $(MAKE) -C $(KERNEL_SRC) M=$(M) W=1 \ -- cgit v1.2.3 From b5094348f14b0b6a6370714d1cd1db923cc189bb Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 19 Jan 2022 15:20:13 -0800 Subject: Update path for the SoC project The gs/google-modules/soc-modules project holds common include headers, build configs and SoC-specific kernel modules. Signed-off-by: Will McVicker Change-Id: Iff00af2bd66f63f04455c4df5381e8a202061c1b --- BUILD.bazel | 8 ++++---- Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index f7e9fe4..b93162e 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -15,16 +15,16 @@ kernel_module( "**/*.h", "Kbuild", ]) + [ - "//gs/kernel/device-modules:gs101_soc_headers", + "//gs/google-modules/soc-modules:gs101_soc_headers", ], outs = [ "nitrous.ko", ], - kernel_build = "//gs/kernel/device-modules:slider", + kernel_build = "//gs/google-modules/soc-modules:slider", kernel_module_deps = [ - "//gs/kernel/device-modules:gs101_soc", + "//gs/google-modules/soc-modules:gs101_soc", ], visibility = [ - "//gs/kernel/device-modules:__pkg__", + "//gs/google-modules/soc-modules:__pkg__", ], ) diff --git a/Makefile b/Makefile index ef805c8..12ff51e 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ M ?= $(shell pwd) KBUILD_OPTIONS := CONFIG_NITROUS=m -include $(KERNEL_SRC)/../gs/kernel/device-modules/Makefile.include +include $(KERNEL_SRC)/../gs/google-modules/soc-modules/Makefile.include modules modules_install clean: $(MAKE) -C $(KERNEL_SRC) M=$(M) W=1 \ -- cgit v1.2.3 From 56054406a419f000f81222b07779b21c2cc87711 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Fri, 4 Feb 2022 14:35:29 -0800 Subject: kleaf: //build/kleaf -> //build/kernel/kleaf. This is part of the build/ -> build/kernel migration. The //build/kleaf package is deprecated. Use //build/kernel/kleaf instead. Test: TH Bug: 217630659 Signed-off-by: Yifan Hong Change-Id: Ifeb0d4c891ec1104969ba4b2405dc40926ec2371 --- BUILD.bazel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BUILD.bazel b/BUILD.bazel index b93162e..01126b5 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -6,7 +6,7 @@ # unless you have coordinated with the team managing the Soong to Bazel # migration. -load("//build/kleaf:kernel.bzl", "kernel_module") +load("//build/kernel/kleaf:kernel.bzl", "kernel_module") kernel_module( name = "broadcom.slider", -- cgit v1.2.3 From d960d05ed7981e3dcba0765c0cb39ac3c24d9d1f Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Mon, 14 Feb 2022 14:45:54 -0800 Subject: ANDROID: Replace "PDE_DATA" with "pde_data" Commit 359745d78351 ("proc: remove PDE_DATA() completely") removed PDE_DATA macro in favor of pde_data. So replace all instances of PDE_DATA to use pde_data. Signed-off-by: Will McVicker Change-Id: Ie912b0d7fb81c1d08595fdf785c4534a5416425c --- nitrous.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nitrous.c b/nitrous.c index d6f274d..d49ae60 100644 --- a/nitrous.c +++ b/nitrous.c @@ -280,13 +280,13 @@ static int nitrous_proc_show(struct seq_file *m, void *v) static int nitrous_proc_open(struct inode *inode, struct file *file) { - return single_open(file, nitrous_proc_show, PDE_DATA(inode)); + return single_open(file, nitrous_proc_show, pde_data(inode)); } static ssize_t nitrous_proc_write(struct file *file, const char *buf, size_t count, loff_t *pos) { - struct nitrous_lpm_proc *data = PDE_DATA(file_inode(file)); + struct nitrous_lpm_proc *data = pde_data(file_inode(file)); struct nitrous_bt_lpm *lpm = data->lpm; struct timespec64 ts; char lbuf[4]; -- cgit v1.2.3