Linux v5.0 rebase

This commit is contained in:
Laura Abbott 2019-03-05 06:44:21 -08:00
commit 1ec9f8fe13
645 changed files with 2134 additions and 4234 deletions

View file

@ -6,27 +6,27 @@ Subject: [PATCH 1/3] Make get_cert_list() not complain about cert lists that
Signed-off-by: Peter Jones <pjones@redhat.com>
---
certs/load_uefi.c | 37 ++++++++++++++++++++++---------------
security/integrity/platform_certs/load_uefi.c | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)
diff --git a/certs/load_uefi.c b/certs/load_uefi.c
index 3d884598601..9ef34c44fd1 100644
--- a/certs/load_uefi.c
+++ b/certs/load_uefi.c
@@ -35,8 +35,8 @@ static __init bool uefi_check_ignore_db(void)
diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
index 81b19c52832b..e188f3ecbce3 100644
--- a/security/integrity/platform_certs/load_uefi.c
+++ b/security/integrity/platform_certs/load_uefi.c
@@ -38,8 +38,8 @@ static __init bool uefi_check_ignore_db(void)
/*
* Get a certificate list blob from the named EFI variable.
*/
-static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
- unsigned long *size)
+static __init int get_cert_list(efi_char16_t *name, efi_guid_t *guid,
+ unsigned long *size, void **cert_list)
+ unsigned long *size , void **cert_list)
{
efi_status_t status;
unsigned long lsize = 4;
@@ -44,26 +44,33 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
@@ -47,24 +47,31 @@ static __init void *get_cert_list(efi_char16_t *name, efi_guid_t *guid,
void *db;
status = efi.get_variable(name, guid, NULL, &lsize, &tmpdb);
+ if (status == EFI_NOT_FOUND) {
+ *size = 0;
@ -39,14 +39,12 @@ index 3d884598601..9ef34c44fd1 100644
- return NULL;
+ return efi_status_to_err(status);
}
db = kmalloc(lsize, GFP_KERNEL);
if (!db) {
pr_err("Couldn't allocate memory for uefi cert list\n");
if (!db)
- return NULL;
+ return -ENOMEM;
}
status = efi.get_variable(name, guid, NULL, &lsize, db);
if (status != EFI_SUCCESS) {
kfree(db);
@ -54,15 +52,15 @@ index 3d884598601..9ef34c44fd1 100644
- return NULL;
+ return efi_status_to_err(status);
}
*size = lsize;
- return db;
+ *cert_list = db;
+ return 0;
}
/*
@@ -152,10 +159,10 @@ static int __init load_uefi_certs(void)
@@ -153,10 +160,10 @@ static int __init load_uefi_certs(void)
* an error if we can't get them.
*/
if (!uefi_check_ignore_db()) {
@ -74,36 +72,33 @@ index 3d884598601..9ef34c44fd1 100644
- } else {
+ } else if (dbsize != 0) {
rc = parse_efi_signature_list("UEFI:db",
db, dbsize, get_handler_for_db);
db, dbsize, get_handler_for_db);
if (rc)
@@ -164,10 +171,10 @@ static int __init load_uefi_certs(void)
@@ -166,10 +173,10 @@ static int __init load_uefi_certs(void)
}
}
- mok = get_cert_list(L"MokListRT", &mok_var, &moksize);
- if (!mok) {
+ rc = get_cert_list(L"MokListRT", &mok_var, &moksize, &mok);
+ if (rc < 0) {
pr_info("MODSIGN: Couldn't get UEFI MokListRT\n");
pr_info("Couldn't get UEFI MokListRT\n");
- } else {
+ } else if (moksize != 0) {
rc = parse_efi_signature_list("UEFI:MokListRT",
mok, moksize, get_handler_for_db);
if (rc)
@@ -175,10 +182,10 @@ static int __init load_uefi_certs(void)
@@ -177,10 +184,10 @@ static int __init load_uefi_certs(void)
kfree(mok);
}
- dbx = get_cert_list(L"dbx", &secure_var, &dbxsize);
- if (!dbx) {
+ rc = get_cert_list(L"dbx", &secure_var, &dbxsize, &dbx);
+ if (rc < 0) {
pr_info("MODSIGN: Couldn't get UEFI dbx list\n");
pr_info("Couldn't get UEFI dbx list\n");
- } else {
+ } else if (dbxsize != 0) {
rc = parse_efi_signature_list("UEFI:dbx",
dbx, dbxsize,
get_handler_for_dbx);
--
2.15.0

View file

@ -6,13 +6,13 @@ Subject: [PATCH 3/3] Make get_cert_list() use efi_status_to_str() to print
Signed-off-by: Peter Jones <pjones@redhat.com>
---
certs/load_uefi.c | 6 ++++--
security/integrity/platform_certs/load_uefi.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/certs/load_uefi.c b/certs/load_uefi.c
diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c
index 9ef34c44fd1..13a2826715d 100644
--- a/certs/load_uefi.c
+++ b/certs/load_uefi.c
--- a/security/integrity/platform_certs/load_uefi.c
+++ b/security/integrity/platform_certs/load_uefi.c
@@ -51,7 +51,8 @@ static __init int get_cert_list(efi_char16_t *name, efi_guid_t *guid,
}

View file

@ -0,0 +1,163 @@
From c72235c288c8cc55d33e257e05d3017c2daf1603 Mon Sep 17 00:00:00 2001
From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Date: Fri, 15 Feb 2019 10:26:48 +0530
Subject: arm64: dts: rockchip: Add on-board WiFi/BT support for Rock960 boards
Add on-board WiFi/BT support for Rock960 boards such as Rock960 based
on AP6356S and Ficus based on AP6354 wireless modules.
Firmwares for the respective boards are available here:
http://people.linaro.org/~manivannan.sadhasivam/rock960_wifi/
http://people.linaro.org/~manivannan.sadhasivam/ficus_wifi/
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 95 +++++++++++++++++++++++-
1 file changed, 94 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index fecb133b0ed2..e40e66e33a5e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -9,6 +9,15 @@
#include "rk3399-opp.dtsi"
/ {
+ sdio_pwrseq: sdio-pwrseq {
+ compatible = "mmc-pwrseq-simple";
+ clocks = <&rk808 1>;
+ clock-names = "ext_clock";
+ pinctrl-names = "default";
+ pinctrl-0 = <&wifi_enable_h>;
+ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
+ };
+
vcc1v8_s0: vcc1v8-s0 {
compatible = "regulator-fixed";
regulator-name = "vcc1v8_s0";
@@ -370,6 +379,20 @@
};
&pinctrl {
+ bt {
+ bt_enable_h: bt-enable-h {
+ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ bt_host_wake_l: bt-host-wake-l {
+ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ bt_wake_l: bt-wake-l {
+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
sdmmc {
sdmmc_bus1: sdmmc-bus1 {
rockchip,pins =
@@ -395,6 +418,26 @@
};
};
+ sdio0 {
+ sdio0_bus4: sdio0-bus4 {
+ rockchip,pins =
+ <2 20 RK_FUNC_1 &pcfg_pull_up_20ma>,
+ <2 21 RK_FUNC_1 &pcfg_pull_up_20ma>,
+ <2 22 RK_FUNC_1 &pcfg_pull_up_20ma>,
+ <2 23 RK_FUNC_1 &pcfg_pull_up_20ma>;
+ };
+
+ sdio0_cmd: sdio0-cmd {
+ rockchip,pins =
+ <2 24 RK_FUNC_1 &pcfg_pull_up_20ma>;
+ };
+
+ sdio0_clk: sdio0-clk {
+ rockchip,pins =
+ <2 25 RK_FUNC_1 &pcfg_pull_none_20ma>;
+ };
+ };
+
pmic {
pmic_int_l: pmic-int-l {
rockchip,pins =
@@ -411,6 +454,19 @@
<1 14 RK_FUNC_GPIO &pcfg_pull_down>;
};
};
+
+ sdio-pwrseq {
+ wifi_enable_h: wifi-enable-h {
+ rockchip,pins =
+ <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+ wifi {
+ wifi_host_wake_l: wifi-host-wake-l {
+ rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
};
&pwm2 {
@@ -421,6 +477,32 @@
status = "okay";
};
+&sdio0 {
+ bus-width = <4>;
+ clock-frequency = <50000000>;
+ cap-sdio-irq;
+ cap-sd-highspeed;
+ keep-power-in-suspend;
+ mmc-pwrseq = <&sdio_pwrseq>;
+ non-removable;
+ pinctrl-names = "default";
+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
+ sd-uhs-sdr104;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "okay";
+
+ brcmf: wifi@1 {
+ compatible = "brcm,bcm4329-fmac";
+ reg = <1>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
+ interrupt-names = "host-wake";
+ pinctrl-names = "default";
+ pinctrl-0 = <&wifi_host_wake_l>;
+ };
+};
+
&sdhci {
bus-width = <8>;
mmc-hs400-1_8v;
@@ -447,8 +529,19 @@
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_xfer &uart0_cts>;
+ pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
status = "okay";
+
+ bluetooth {
+ compatible = "brcm,bcm43438-bt";
+ clocks = <&rk808 1>;
+ clock-names = "ext_clock";
+ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
+ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
+ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
+ };
};
&uart2 {
--
cgit 1.2-0.3.lf.el7

View file

@ -0,0 +1,43 @@
From 803346a8efc9062da732c9d3e0b8e7079096f1ad Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel@collabora.com>
Date: Tue, 29 Jan 2019 08:33:24 -0300
Subject: arm64: dts: rockchip: Enable HDMI audio devices on rk3399-rock960
This commit enable the hdmi-sound and i2s2 devices needed to have
audio over HDMI on both rock960 and the related ficus board.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Acked-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 56abbb08c133..fecb133b0ed2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -94,6 +94,10 @@
status = "okay";
};
+&hdmi_sound {
+ status = "okay";
+};
+
&i2c0 {
clock-frequency = <400000>;
i2c-scl-rising-time-ns = <168>;
@@ -336,6 +340,10 @@
status = "okay";
};
+&i2s2 {
+ status = "okay";
+};
+
&io_domains {
bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */
audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */
--
cgit 1.2-0.3.lf.el7

View file

@ -0,0 +1,35 @@
From 02260a619efe574d0f6c2a4420b8b76c6802294e Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel@collabora.com>
Date: Fri, 15 Feb 2019 12:25:39 -0300
Subject: arm64: dts: rockchip: Enable tsadc device on rock960
Enable the thermal sensor. This device also provides
temperature shutdown protection. The shutdown value is
set at 110C, as tested by the vendor.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index e40e66e33a5e..2927db4dda9d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -527,6 +527,13 @@
status = "okay";
};
+&tsadc {
+ rockchip,hw-tshut-mode = <1>;
+ rockchip,hw-tshut-polarity = <1>;
+ rockchip,hw-tshut-temp = <110000>;
+ status = "okay";
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
--
cgit 1.2-0.3.lf.el7

View file

@ -17,8 +17,8 @@ i686=generic:generic-x86:generic-x86-i686
i686-debug=generic:generic-x86:generic-x86-i686:debug:debug-x86
# ppc64le
ppc64le=generic:generic-powerpc:generic-powerpc-powerpc64le
ppc64le-debug=generic:generic-powerpc:generic-powerpc-powerpc64le:debug
ppc64le=generic:generic-powerpc
ppc64le-debug=generic:generic-powerpc:generic-powerpc:debug
# s390x
s390x=generic:generic-s390x

View file

@ -1 +0,0 @@
CONFIG_DEBUG_SLAB=y

View file

@ -1 +0,0 @@
# CONFIG_AB3100_CORE is not set

View file

@ -1 +0,0 @@
# CONFIG_AB3100_OTP is not set

View file

@ -1 +0,0 @@
# CONFIG_AD5686 is not set

View file

@ -0,0 +1 @@
CONFIG_AD7124=m

View file

@ -0,0 +1 @@
CONFIG_AD7949=m

View file

@ -1 +0,0 @@
# CONFIG_ADM8211 is not set

View file

@ -1 +0,0 @@
# CONFIG_AIC79XX_BUILD_FIRMWARE is not set

View file

@ -1 +0,0 @@
# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set

View file

@ -1 +0,0 @@
# CONFIG_AIRO is not set

View file

@ -1 +0,0 @@
# CONFIG_AIRO_CS is not set

View file

@ -1 +0,0 @@
CONFIG_APM_POWER=m

View file

@ -1 +0,0 @@
CONFIG_AT76C50X_USB=m

View file

@ -1 +0,0 @@
# CONFIG_ATMEL is not set

View file

@ -1 +0,0 @@
# CONFIG_ATM_AMBASSADOR_DEBUG is not set

View file

@ -1 +0,0 @@
CONFIG_ATM_FORE200E_DEBUG=0

View file

@ -1 +0,0 @@
CONFIG_ATM_FORE200E_TX_RETRY=16

View file

@ -1 +0,0 @@
# CONFIG_ATM_FORE200E_USE_TASKLET is not set

View file

@ -1 +0,0 @@
# CONFIG_ATM_HORIZON_DEBUG is not set

View file

@ -1 +0,0 @@
# CONFIG_ATM_IA_DEBUG is not set

View file

@ -1 +0,0 @@
# CONFIG_ATM_IDT77252_DEBUG is not set

View file

@ -1 +0,0 @@
# CONFIG_ATM_IDT77252_RCV_ALL is not set

View file

@ -1 +0,0 @@
# CONFIG_ATM_ZATM_DEBUG is not set

View file

@ -1 +0,0 @@
CONFIG_BACKLIGHT_WM831X=m

View file

@ -1 +0,0 @@
CONFIG_BCM63XX_PHY=m

View file

@ -1 +0,0 @@
# CONFIG_BCM7038_WDT is not set

View file

@ -1 +0,0 @@
# CONFIG_BCM_FLEXRM_MBOX is not set

View file

@ -1 +0,0 @@
# CONFIG_BLK_WBT_SQ is not set

View file

@ -0,0 +1 @@
CONFIG_BPF_LIRC_MODE2=y

View file

@ -1 +0,0 @@
CONFIG_BT_WILINK=m

View file

@ -1 +0,0 @@
CONFIG_CAN_LEDS=y

View file

@ -1 +0,0 @@
# CONFIG_CAN_TSCAN1 is not set

View file

@ -1 +0,0 @@
# CONFIG_CAPI_EICON is not set

View file

@ -1 +0,0 @@
# CONFIG_CELL_CPU is not set

View file

@ -1 +0,0 @@
CONFIG_CFQ_GROUP_IOSCHED=y

View file

@ -1 +0,0 @@
# CONFIG_CHARGER_PCF50633 is not set

View file

@ -1 +0,0 @@
CONFIG_CIFS_NFSD_EXPORT=y

View file

@ -0,0 +1 @@
CONFIG_CRYPTO_ADIANTUM=m

View file

@ -0,0 +1 @@
CONFIG_CRYPTO_STREEBOG=m

View file

@ -0,0 +1 @@
# CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN is not set

View file

@ -1 +0,0 @@
CONFIG_DEFAULT_CFQ=y

View file

@ -1 +0,0 @@
# CONFIG_DEFAULT_DEADLINE is not set

View file

@ -1 +0,0 @@
# CONFIG_DEFAULT_NOOP is not set

View file

@ -1 +0,0 @@
# CONFIG_DEFXX is not set

View file

@ -1 +0,0 @@
# CONFIG_DPM_WATCHDOG is not set # revisit this in debug

View file

@ -1 +1 @@
# CONFIG_DRM_PANEL is not set
CONFIG_DRM_PANEL=y

View file

@ -0,0 +1 @@
CONFIG_DRM_PANEL_BRIDGE=y

View file

@ -0,0 +1 @@
# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set

View file

@ -0,0 +1 @@
# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set

View file

@ -0,0 +1 @@
# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set

View file

@ -1 +0,0 @@
# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set

View file

@ -1 +0,0 @@
# CONFIG_DVB_RTL2832_SDR is not set

View file

@ -0,0 +1 @@
# CONFIG_EDAC_SYNOPSYS is not set

View file

@ -1 +0,0 @@
# CONFIG_EFI_SIGNATURE_LIST_PARSER is not set

View file

@ -1 +0,0 @@
# CONFIG_ENC28J60 is not set

View file

@ -0,0 +1 @@
# CONFIG_ENERGY_MODEL is not set

View file

@ -1 +0,0 @@
# CONFIG_EXOFS_DEBUG is not set

View file

@ -1 +0,0 @@
# CONFIG_EZNPS_GIC is not set

View file

@ -1 +0,0 @@
CONFIG_FB_ATY128_BACKLIGHT=y

View file

@ -1 +0,0 @@
CONFIG_FB_ATY_BACKLIGHT=y

View file

@ -1 +0,0 @@
# CONFIG_FB_ATY_CT is not set

View file

@ -1 +0,0 @@
# CONFIG_FB_ATY_GX is not set

View file

@ -1 +0,0 @@
# CONFIG_FB_BROADSHEET is not set

View file

@ -1 +0,0 @@
# CONFIG_FB_HECUBA is not set

View file

@ -0,0 +1 @@
# CONFIG_FB_LOGO_CENTER is not set

View file

@ -1 +0,0 @@
CONFIG_FB_NVIDIA_BACKLIGHT=y

View file

@ -1 +0,0 @@
# CONFIG_FB_NVIDIA_DEBUG is not set

View file

@ -1 +0,0 @@
# CONFIG_FB_NVIDIA_I2C is not set

View file

@ -1 +0,0 @@
# CONFIG_FB_PM2_FIFO_DISCONNECT is not set

View file

@ -1 +0,0 @@
# CONFIG_FB_PRE_INIT_FB is not set

View file

@ -1 +0,0 @@
CONFIG_FB_RADEON_BACKLIGHT=y

View file

@ -1 +0,0 @@
# CONFIG_FB_RADEON_DEBUG is not set

View file

@ -1 +0,0 @@
# CONFIG_FB_RADEON_I2C is not set

View file

@ -1 +0,0 @@
CONFIG_FB_RIVA_BACKLIGHT=y

View file

@ -1 +0,0 @@
# CONFIG_FB_RIVA_DEBUG is not set

View file

@ -1 +0,0 @@
# CONFIG_FB_RIVA_I2C is not set

View file

@ -1 +0,0 @@
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set

View file

@ -1 +0,0 @@
# CONFIG_GPIO_104_DIO_48E is not set

View file

@ -1 +0,0 @@
# CONFIG_GPIO_104_IDIO_16 is not set

View file

@ -1 +0,0 @@
# CONFIG_GPIO_BT8XX is not set

View file

@ -0,0 +1 @@
CONFIG_GPIO_CADENCE=m

View file

@ -1 +1 @@
# CONFIG_GPIO_PCA953X is not set
CONFIG_GPIO_PCA953X=m

View file

@ -0,0 +1 @@
# CONFIG_GPIO_SAMA5D2_PIOBU is not set

View file

@ -1 +0,0 @@
# CONFIG_GPIO_TS5500 is not set

View file

@ -0,0 +1 @@
CONFIG_HSA_AMD=y

View file

@ -1 +0,0 @@
# CONFIG_HSU_DMA_PCI is not set

View file

@ -0,0 +1 @@
# CONFIG_I3C is not set

View file

@ -1 +0,0 @@
CONFIG_IMA_APPRAISE_BOOTPARAM=y

View file

@ -1 +0,0 @@
# CONFIG_IMA_BLACKLIST_KEYRING is not set

View file

@ -1 +0,0 @@
# CONFIG_IMA_LOAD_X509 is not set

Some files were not shown because too many files have changed in this diff Show more