git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107263 from edibopp/patch-rtl8761b

Firmware and kernel patch for Realtek RTL8761b

commitce8c83623d8c195cc2ad87c4b7efaee333f2f4e9 authorGabriel Ebner <gebner@gebner.org> dateFri 25 Dec 2020, 11:08 (6 years ago) parent351f3c081f4bca
5 files changed+73
nixos/modules/hardware/all-firmware.nix+1 pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nix+29 pkgs/os-specific/linux/kernel/patches.nix+7 pkgs/os-specific/linux/kernel/rtl8761b-support.patch+33 pkgs/top-level/all-packages.nix+3
nixos/modules/hardware/all-firmware.nix+1
@@ -48,6 +48,7 @@ in {
4848 rtl8192su-firmware
4949 rt5677-firmware
5050 rtl8723bs-firmware
51+ rtl8761b-firmware
5152 rtlwifi_new-firmware
5253 zd1211fw
5354 alsa-firmware
pkgs/os-specific/linux/firmware/rtl8761b-firmware/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ stdenv, fetchFromGitHub }:
2+
3+stdenv.mkDerivation {
4+ name = "rtl8761b-firmware";
5+
6+ src = fetchFromGitHub {
7+ owner = "Realtek-OpenSource";
8+ repo = "android_hardware_realtek";
9+ rev = "rtk1395";
10+ sha256 = "sha256-vd9sZP7PGY+cmnqVty3sZibg01w8+UNinv8X85B+dzc=";
11+ };
12+
13+ installPhase = ''
14+ install -D -pm644 \
15+ bt/rtkbt/Firmware/BT/rtl8761b_fw \
16+ $out/lib/firmware/rtl_bt/rtl8761b_fw.bin
17+
18+ install -D -pm644 \
19+ bt/rtkbt/Firmware/BT/rtl8761b_config \
20+ $out/lib/firmware/rtl_bt/rtl8761b_config.bin
21+ '';
22+
23+ meta = with stdenv.lib; {
24+ description = "Firmware for Realtek RTL8761b";
25+ license = licenses.unfreeRedistributableFirmware;
26+ maintainers = with maintainers; [ edibopp ];
27+ platforms = with platforms; linux;
28+ };
29+}
pkgs/os-specific/linux/kernel/patches.nix+7
@@ -76,6 +76,13 @@
7676 };
7777 };
7878
79+ # Adapted for Linux 5.4 from:
80+ # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=04896832c94aae4842100cafb8d3a73e1bed3a45
81+ rtl8761b_support =
82+ { name = "rtl8761b-support";
83+ patch = ./rtl8761b-support.patch;
84+ };
85+
7986 export_kernel_fpu_functions = {
8087 "4.14" = {
8188 name = "export_kernel_fpu_functions";
pkgs/os-specific/linux/kernel/rtl8761b-support.patchnew file+33
@@ -0,0 +1,33 @@
1+diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
2+index 67f4bc21e7c5..3a9afc905f24 100644
3+--- a/drivers/bluetooth/btrtl.c
4++++ b/drivers/bluetooth/btrtl.c
5+@@ -130,12 +130,19 @@ static const struct id_table ic_id_table[] = {
6+ .cfg_name = "rtl_bt/rtl8821c_config" },
7+
8+ /* 8761A */
9+- { IC_MATCH_FL_LMPSUBV, RTL_ROM_LMP_8761A, 0x0,
10++ { IC_INFO(RTL_ROM_LMP_8761A, 0xa),
11+ .config_needed = false,
12+ .has_rom_version = true,
13+ .fw_name = "rtl_bt/rtl8761a_fw.bin",
14+ .cfg_name = "rtl_bt/rtl8761a_config" },
15+
16++ /* 8761B */
17++ { IC_INFO(RTL_ROM_LMP_8761A, 0xb),
18++ .config_needed = false,
19++ .has_rom_version = true,
20++ .fw_name = "rtl_bt/rtl8761b_fw.bin",
21++ .cfg_name = "rtl_bt/rtl8761b_config" },
22++
23+ /* 8822C with USB interface */
24+ { IC_INFO(RTL_ROM_LMP_8822B, 0xc),
25+ .config_needed = false,
26+@@ -251,6 +258,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev,
27+ { RTL_ROM_LMP_8723B, 9 }, /* 8723D */
28+ { RTL_ROM_LMP_8821A, 10 }, /* 8821C */
29+ { RTL_ROM_LMP_8822B, 13 }, /* 8822C */
30++ { RTL_ROM_LMP_8761A, 14 }, /* 8761B */
31+ };
32+
33+ min_size = sizeof(struct rtl_epatch_header) + sizeof(extension_sig) + 3;
pkgs/top-level/all-packages.nix+3
@@ -18386,6 +18386,7 @@ in
1838618386 kernelPatches = [
1838718387 kernelPatches.bridge_stp_helper
1838818388 kernelPatches.request_key_helper
18389+ kernelPatches.rtl8761b_support
1838918390 kernelPatches.export_kernel_fpu_functions."5.3"
1839018391 ];
1839118392 };
@@ -19142,6 +19143,8 @@ in
1914219143
1914319144 rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { };
1914419145
19146+ rtl8761b-firmware = callPackage ../os-specific/linux/firmware/rtl8761b-firmware { };
19147+
1914519148 rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { };
1914619149
1914719150 s3ql = callPackage ../tools/backup/s3ql { };