Cleaned up phinephone stuff
This commit is contained in:
@@ -1 +0,0 @@
|
||||
DIST orange-pi-6.4-20230701-2252.tar.gz 228861292 BLAKE2B 307d27bdf0c5132ad8b5480928e516142d72396db2e643b50fbccf9bb0a14bbdd8cffc7ab7299fc1c7c3563aaf029da5ee405b3fec8178079aa2e48b0d38fd12 SHA512 46d824824760bef96d77338dc10c9beb07935ee366050d7c8f789b30304765bb740cdaf90c12211567f0f82953afed712dbe2c97224bd8318a51cb1e7d14ec67
|
||||
@@ -1,175 +0,0 @@
|
||||
From 602d05e416ae0d0fba3022fa2c3d195164b406c6 Mon Sep 17 00:00:00 2001
|
||||
From: Clayton Craft <clayton@craftyguy.net>
|
||||
Date: Wed, 16 Dec 2020 20:16:14 -0800
|
||||
Subject: [PATCH] dts: pinephone: drop modem-power node
|
||||
|
||||
---
|
||||
.../allwinner/sun50i-a64-pinephone-1.0.dts | 26 +++---------------
|
||||
.../allwinner/sun50i-a64-pinephone-1.1.dts | 27 +++----------------
|
||||
.../allwinner/sun50i-a64-pinephone-1.2.dts | 27 +++----------------
|
||||
.../dts/allwinner/sun50i-a64-pinephone.dtsi | 12 +++++++++
|
||||
4 files changed, 24 insertions(+), 68 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
|
||||
index a21c6d78a..7f0cfdafe 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
|
||||
@@ -86,28 +86,6 @@ ®_drivevbus {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
-&uart3 {
|
||||
- modem {
|
||||
- compatible = "quectel,eg25";
|
||||
- char-device-name = "modem-power";
|
||||
-
|
||||
- power-supply = <®_vbat_bb>; /* PL7 */
|
||||
-
|
||||
- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */
|
||||
- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */
|
||||
- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
|
||||
-
|
||||
- sleep-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
|
||||
- wakeup-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-RI */
|
||||
-
|
||||
- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */
|
||||
- dtr-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-DTR */
|
||||
- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */
|
||||
-
|
||||
- quectel,qdai = "1,1,0,1,0,0,1,1";
|
||||
- };
|
||||
-};
|
||||
-
|
||||
&usbphy {
|
||||
usb-role-switch;
|
||||
|
||||
@@ -118,6 +96,10 @@ usb0_drd_sw: endpoint {
|
||||
};
|
||||
};
|
||||
|
||||
+&ring_indicator {
|
||||
+ gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
|
||||
+};
|
||||
+
|
||||
&sgm3140 {
|
||||
enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
|
||||
flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
|
||||
index 61ff56b17..5e85ddc12 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
|
||||
@@ -109,34 +109,15 @@ ®_drivevbus {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&ring_indicator {
|
||||
+ gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
|
||||
+};
|
||||
+
|
||||
&sgm3140 {
|
||||
enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
|
||||
flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
|
||||
};
|
||||
|
||||
-&uart3 {
|
||||
- modem {
|
||||
- compatible = "quectel,eg25";
|
||||
- char-device-name = "modem-power";
|
||||
-
|
||||
- power-supply = <®_vbat_bb>; /* PL7 */
|
||||
-
|
||||
- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */
|
||||
- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */
|
||||
- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
|
||||
- //status-pwrkey-multiplexed; /* status acts as pwrkey */
|
||||
-
|
||||
- sleep-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
|
||||
- wakeup-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-RI */
|
||||
-
|
||||
- dtr-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-DTR */
|
||||
- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */
|
||||
- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */
|
||||
-
|
||||
- quectel,qdai = "1,1,0,1,0,0,1,1";
|
||||
- };
|
||||
-};
|
||||
-
|
||||
&usbphy {
|
||||
usb-role-switch;
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
|
||||
index fe7d567a8..f4b9b0991 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
|
||||
@@ -101,34 +101,15 @@ ®_anx1v0 {
|
||||
enable-active-high;
|
||||
};
|
||||
|
||||
+&ring_indicator {
|
||||
+ gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
|
||||
+};
|
||||
+
|
||||
&sgm3140 {
|
||||
enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
|
||||
flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
|
||||
};
|
||||
|
||||
-&uart3 {
|
||||
- modem {
|
||||
- compatible = "quectel,eg25";
|
||||
- char-device-name = "modem-power";
|
||||
-
|
||||
- power-supply = <®_vbat_bb>; /* PL7 */
|
||||
-
|
||||
- enable-gpios = <&pio 7 8 GPIO_ACTIVE_LOW>; /* PH8 */
|
||||
- reset-gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4 */
|
||||
- status-gpios = <&pio 7 9 GPIO_ACTIVE_HIGH>; /* PH9 */
|
||||
- pwrkey-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */
|
||||
-
|
||||
- host-ready-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
|
||||
- wakeup-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6-RI */
|
||||
-
|
||||
- dtr-gpios = <&pio 1 2 GPIO_ACTIVE_HIGH>; /* PB2-DTR */
|
||||
- cts-gpios = <&pio 3 5 GPIO_ACTIVE_HIGH>; /* PD5-CTS */
|
||||
- rts-gpios = <&pio 3 4 GPIO_ACTIVE_HIGH>; /* PD4-RTS */
|
||||
-
|
||||
- quectel,qdai = "1,1,0,1,0,0,1,1";
|
||||
- };
|
||||
-};
|
||||
-
|
||||
&usbphy {
|
||||
usb-role-switch;
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
index 346113382..7b48126d1 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
@@ -192,6 +192,17 @@ ec25_codec: ec25-codec {
|
||||
sound-name-prefix = "Modem";
|
||||
};
|
||||
|
||||
+ gpio-keys {
|
||||
+ compatible = "gpio-keys";
|
||||
+
|
||||
+ ring_indicator: ring-indicator {
|
||||
+ label = "Ring Indicator";
|
||||
+ linux,can-disable;
|
||||
+ linux,code = <KEY_WAKEUP>;
|
||||
+ wakeup-source;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
i2c_csi: i2c-csi {
|
||||
compatible = "i2c-gpio";
|
||||
sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
|
||||
@@ -264,6 +275,7 @@ reg_usb_5v: usb-5v {
|
||||
reg_vbat_bb: vbat-bb {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vbat-bb";
|
||||
+ regulator-always-on;
|
||||
regulator-min-microvolt = <3500000>;
|
||||
regulator-max-microvolt = <3500000>;
|
||||
gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
From 60d8aedea7c8c390ee744730ab3e565ea84496fb Mon Sep 17 00:00:00 2001
|
||||
From: Danct12 <danct12@disroot.org>
|
||||
Date: Fri, 10 Dec 2021 23:01:34 +0700
|
||||
Subject: [PATCH] arm64: dts: rk3399-pinephone-pro: Remove modem node
|
||||
|
||||
Since we don't use modem-power driver, this can be removed
|
||||
for eg25-manager.
|
||||
---
|
||||
.../dts/rockchip/rk3399-pinephone-pro.dts | 40 +------------------
|
||||
1 file changed, 2 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
|
||||
index 61c990764..13141c643 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
|
||||
@@ -413,6 +413,7 @@
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
vin-supply = <&vcc5v0_sys>;
|
||||
+ regulator-always-on;
|
||||
};
|
||||
|
||||
vcc_4g: vcc-4g {
|
||||
@@ -425,6 +426,7 @@
|
||||
regulator-min-microvolt = <3800000>;
|
||||
regulator-max-microvolt = <3800000>;
|
||||
vin-supply = <&vcc_sys>;
|
||||
+ regulator-always-on;
|
||||
};
|
||||
|
||||
vcc1v8_codec: vcc1v8-codec-regulator {
|
||||
@@ -1187,31 +1189,6 @@
|
||||
|
||||
&uart3 {
|
||||
status = "okay";
|
||||
-
|
||||
- modem {
|
||||
- compatible = "quectel,eg25";
|
||||
- char-device-name = "modem-power";
|
||||
-
|
||||
- pinctrl-names = "default";
|
||||
- pinctrl-0 = <&modem_control_pins>;
|
||||
-
|
||||
- power-supply = <&vcc_4g>;
|
||||
- vbus-supply = <&vcc_4g_5v>;
|
||||
-
|
||||
- enable-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; // W_DISABLE#
|
||||
- reset-gpios = <&gpio3 RK_PB0 GPIO_ACTIVE_HIGH>;
|
||||
- status-gpios = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;
|
||||
- pwrkey-gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
|
||||
-
|
||||
- host-ready-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; // apready
|
||||
- wakeup-gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; // ri
|
||||
-
|
||||
- dtr-gpios = <&gpio0 RK_PA3 GPIO_ACTIVE_HIGH>;
|
||||
- cts-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
|
||||
- rts-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
|
||||
-
|
||||
- quectel,qdai = "3,0,0,4,0,0,1,1";
|
||||
- };
|
||||
};
|
||||
|
||||
&pmu_io_domains {
|
||||
@@ -1292,19 +1269,6 @@
|
||||
vcc_4g_en: vcc-4g-en-pin {
|
||||
rockchip,pins = <4 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
-
|
||||
- modem_control_pins: modem-control-pins {
|
||||
- rockchip,pins =
|
||||
- <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
- <3 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
- <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
- <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
- <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
- <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
- <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
- <3 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,
|
||||
- <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
- };
|
||||
};
|
||||
|
||||
pmic {
|
||||
--
|
||||
2.34.1
|
||||
@@ -1,48 +0,0 @@
|
||||
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
|
||||
Date: Wed, 8 Dec 2021 23:43:08 +0100
|
||||
Subject: arm64: dts: rk3399-pinephone-pro: add modem RI pin
|
||||
|
||||
Taht way the modem can wake the phone on incoming calls/messages.
|
||||
|
||||
Signed-off-by: Arnaud Ferraris <arnaud.ferraris@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
|
||||
index de07518..91687f6 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
|
||||
@@ -160,6 +160,21 @@ power {
|
||||
};
|
||||
};
|
||||
|
||||
+ gpio-key-ri {
|
||||
+ compatible = "gpio-keys";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&ri_pin>;
|
||||
+
|
||||
+ ring_indicator: ring-indicator {
|
||||
+ label = "ring-indicator";
|
||||
+ linux,can-disable;
|
||||
+ linux,code = <KEY_WAKEUP>;
|
||||
+ gpios = <&gpio0 RK_PA1 GPIO_ACTIVE_LOW>;
|
||||
+ wakeup-event-action = <EV_ACT_ASSERTED>;
|
||||
+ wakeup-source;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
// in1 - digital mic daughhterboard
|
||||
// in2 - headset mic
|
||||
// in3 - modem output (muxed with mono)
|
||||
@@ -1127,6 +1142,10 @@ flash_pins: flash-pins {
|
||||
};
|
||||
|
||||
modem {
|
||||
+ ri_pin: ri-pin {
|
||||
+ rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
+ };
|
||||
+
|
||||
vcc_4g_5v_en: vcc-4g-5v-en-pin {
|
||||
rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
@@ -1,50 +0,0 @@
|
||||
diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
|
||||
index 149cfde817cb..0399d8714fd0 100644
|
||||
--- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
|
||||
+++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
|
||||
@@ -984,6 +984,8 @@ static int sun50i_a64_ccu_probe(struct p
|
||||
if (IS_ERR(reg))
|
||||
return PTR_ERR(reg);
|
||||
|
||||
+ platform_set_drvdata(pdev, reg);
|
||||
+
|
||||
/* Force the pll-audio variable divider to 3 */
|
||||
val = readl(reg + SUN50I_A64_PLL_AUDIO_REG);
|
||||
val &= ~GENMASK(19, 16);
|
||||
@@ -1031,12 +1031,36 @@ static const struct of_device_id sun50i_
|
||||
{ }
|
||||
};
|
||||
|
||||
+#define USBPHY_CFG_REG 0x0cc
|
||||
+
|
||||
+static int sun50i_a64_ccu_suspend(struct device *dev)
|
||||
+{
|
||||
+ void __iomem *reg = dev_get_drvdata(dev);
|
||||
+
|
||||
+ writel(readl(reg + USBPHY_CFG_REG) | 0xa00000, reg + USBPHY_CFG_REG);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static int sun50i_a64_ccu_resume(struct device *dev)
|
||||
+{
|
||||
+ void __iomem *reg = dev_get_drvdata(dev);
|
||||
+
|
||||
+ writel(readl(reg + USBPHY_CFG_REG) & ~0xa00000, reg + USBPHY_CFG_REG);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static SIMPLE_DEV_PM_OPS(sun50i_a64_ccu_pm_ops,
|
||||
+ sun50i_a64_ccu_suspend, sun50i_a64_ccu_resume);
|
||||
+
|
||||
static struct platform_driver sun50i_a64_ccu_driver = {
|
||||
.probe = sun50i_a64_ccu_probe,
|
||||
.driver = {
|
||||
.name = "sun50i-a64-ccu",
|
||||
.suppress_bind_attrs = true,
|
||||
.of_match_table = sun50i_a64_ccu_ids,
|
||||
+ .pm = &sun50i_a64_ccu_pm_ops,
|
||||
},
|
||||
};
|
||||
builtin_platform_driver(sun50i_a64_ccu_driver);
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||||
index 03b83aa91277..dfc6c7d1b0e7 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -4070,6 +4070,7 @@ static int btusb_setup_qca(struct hci_dev *hdev)
|
||||
}
|
||||
if (!info) {
|
||||
bt_dev_err(hdev, "don't support firmware rome 0x%x", ver_rom);
|
||||
+ if (ver_rom & ~0xffffU) return 0;
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
From cb408fb65a08bd45543724c1e9b8f38ae1bebc4a Mon Sep 17 00:00:00 2001
|
||||
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
|
||||
Date: Tue, 4 Aug 2020 15:12:59 +0200
|
||||
Subject: [PATCH 177/183] leds-gpio: make max_brightness configurable
|
||||
|
||||
---
|
||||
drivers/leds/leds-gpio.c | 4 ++++
|
||||
include/linux/leds.h | 3 ++-
|
||||
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
|
||||
index 93f5b1b60fde..f8483fab1164 100644
|
||||
--- a/drivers/leds/leds-gpio.c
|
||||
+++ b/drivers/leds/leds-gpio.c
|
||||
@@ -108,6 +108,8 @@ static int create_gpio_led(const struct gpio_led *template,
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
+ led_dat->cdev.max_brightness = template->max_brightness;
|
||||
+
|
||||
if (template->name) {
|
||||
led_dat->cdev.name = template->name;
|
||||
ret = devm_led_classdev_register(parent, &led_dat->cdev);
|
||||
@@ -177,6 +179,8 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
|
||||
if (fwnode_property_present(child, "panic-indicator"))
|
||||
led.panic_indicator = 1;
|
||||
|
||||
+ fwnode_property_read_u32(child, "max-brightness", &led.max_brightness);
|
||||
+
|
||||
ret = create_gpio_led(&led, led_dat, dev, child, NULL);
|
||||
if (ret < 0) {
|
||||
fwnode_handle_put(child);
|
||||
diff --git a/include/linux/leds.h b/include/linux/leds.h
|
||||
index 6a8d6409c993..99a80092114d 100644
|
||||
--- a/include/linux/leds.h
|
||||
+++ b/include/linux/leds.h
|
||||
@@ -513,7 +513,8 @@ typedef int (*gpio_blink_set_t)(struct gpio_desc *desc, int state,
|
||||
struct gpio_led {
|
||||
const char *name;
|
||||
const char *default_trigger;
|
||||
- unsigned gpio;
|
||||
+ unsigned gpio;
|
||||
+ unsigned max_brightness;
|
||||
unsigned active_low : 1;
|
||||
unsigned retain_state_suspended : 1;
|
||||
unsigned panic_indicator : 1;
|
||||
--
|
||||
2.30.0
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
index 1c555456b..05fab5d79 100644
|
||||
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
||||
@@ -78,6 +78,7 @@ green {
|
||||
};
|
||||
|
||||
led-2 {
|
||||
+ linux,default-trigger = "panic";
|
||||
function = LED_FUNCTION_INDICATOR;
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
gpios = <&pio 3 19 GPIO_ACTIVE_HIGH>; /* PD19 */
|
||||
@@ -1,66 +0,0 @@
|
||||
From: Anthony G. Basile <blueness@gentoo.org>
|
||||
|
||||
This patch adds support for a restricted user-controlled namespace on
|
||||
tmpfs filesystem used to house PaX flags. The namespace must be of the
|
||||
form user.pax.* and its value cannot exceed a size of 8 bytes.
|
||||
|
||||
This is needed even on all Gentoo systems so that XATTR_PAX flags
|
||||
are preserved for users who might build packages using portage on
|
||||
a tmpfs system with a non-hardened kernel and then switch to a
|
||||
hardened kernel with XATTR_PAX enabled.
|
||||
|
||||
The namespace is added to any user with Extended Attribute support
|
||||
enabled for tmpfs. Users who do not enable xattrs will not have
|
||||
the XATTR_PAX flags preserved.
|
||||
|
||||
|
||||
--- a/include/uapi/linux/xattr.h 2022-11-22 05:56:58.175733644 -0500
|
||||
+++ b/include/uapi/linux/xattr.h 2022-11-22 06:04:26.394834989 -0500
|
||||
@@ -81,5 +81,9 @@
|
||||
#define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
|
||||
#define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
|
||||
|
||||
+/* User namespace */
|
||||
+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
|
||||
+#define XATTR_PAX_FLAGS_SUFFIX "flags"
|
||||
+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
|
||||
|
||||
#endif /* _UAPI_LINUX_XATTR_H */
|
||||
--- a/mm/shmem.c 2022-11-22 05:57:29.011626215 -0500
|
||||
+++ b/mm/shmem.c 2022-11-22 06:03:33.165939400 -0500
|
||||
@@ -3297,6 +3297,14 @@ static int shmem_xattr_handler_set(const
|
||||
struct shmem_inode_info *info = SHMEM_I(inode);
|
||||
int err;
|
||||
|
||||
+
|
||||
+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
|
||||
+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
|
||||
+ return -EOPNOTSUPP;
|
||||
+ if (size > 8)
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
name = xattr_full_name(handler, name);
|
||||
err = simple_xattr_set(&info->xattrs, name, value, size, flags, NULL);
|
||||
if (!err) {
|
||||
@@ -3312,6 +3320,12 @@ static const struct xattr_handler shmem_
|
||||
.set = shmem_xattr_handler_set,
|
||||
};
|
||||
|
||||
+static const struct xattr_handler shmem_user_xattr_handler = {
|
||||
+ .prefix = XATTR_USER_PREFIX,
|
||||
+ .get = shmem_xattr_handler_get,
|
||||
+ .set = shmem_xattr_handler_set,
|
||||
+};
|
||||
+
|
||||
static const struct xattr_handler shmem_trusted_xattr_handler = {
|
||||
.prefix = XATTR_TRUSTED_PREFIX,
|
||||
.get = shmem_xattr_handler_get,
|
||||
@@ -3325,6 +3339,7 @@ static const struct xattr_handler *shmem
|
||||
#endif
|
||||
&shmem_security_xattr_handler,
|
||||
&shmem_trusted_xattr_handler,
|
||||
+ &shmem_user_xattr_handler,
|
||||
NULL
|
||||
};
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
--- a/fs/namei.c 2022-01-23 13:02:27.876558299 -0500
|
||||
+++ b/fs/namei.c 2022-03-06 12:47:39.375719693 -0500
|
||||
@@ -1020,10 +1020,10 @@ static inline void put_link(struct namei
|
||||
path_put(&last->link);
|
||||
}
|
||||
|
||||
-static int sysctl_protected_symlinks __read_mostly;
|
||||
-static int sysctl_protected_hardlinks __read_mostly;
|
||||
-static int sysctl_protected_fifos __read_mostly;
|
||||
-static int sysctl_protected_regular __read_mostly;
|
||||
+static int sysctl_protected_symlinks __read_mostly = 1;
|
||||
+static int sysctl_protected_hardlinks __read_mostly = 1;
|
||||
+int sysctl_protected_fifos __read_mostly = 1;
|
||||
+int sysctl_protected_regular __read_mostly = 1;
|
||||
|
||||
#ifdef CONFIG_SYSCTL
|
||||
static struct ctl_table namei_sysctls[] = {
|
||||
@@ -1,17 +0,0 @@
|
||||
--- a/arch/sparc/mm/init_64.c 2022-05-24 16:48:40.749677491 -0400
|
||||
+++ b/arch/sparc/mm/init_64.c 2022-05-24 16:55:15.511356945 -0400
|
||||
@@ -3052,11 +3052,11 @@ static inline resource_size_t compute_ke
|
||||
static void __init kernel_lds_init(void)
|
||||
{
|
||||
code_resource.start = compute_kern_paddr(_text);
|
||||
- code_resource.end = compute_kern_paddr(_etext - 1);
|
||||
+ code_resource.end = compute_kern_paddr(_etext) - 1;
|
||||
data_resource.start = compute_kern_paddr(_etext);
|
||||
- data_resource.end = compute_kern_paddr(_edata - 1);
|
||||
+ data_resource.end = compute_kern_paddr(_edata) - 1;
|
||||
bss_resource.start = compute_kern_paddr(__bss_start);
|
||||
- bss_resource.end = compute_kern_paddr(_end - 1);
|
||||
+ bss_resource.end = compute_kern_paddr(_end) - 1;
|
||||
}
|
||||
|
||||
static int __init report_memory(void)
|
||||
@@ -1,37 +0,0 @@
|
||||
The encryption is only mandatory to be enforced when both sides are using
|
||||
Secure Simple Pairing and this means the key size check makes only sense
|
||||
in that case.
|
||||
|
||||
On legacy Bluetooth 2.0 and earlier devices like mice the encryption was
|
||||
optional and thus causing an issue if the key size check is not bound to
|
||||
using Secure Simple Pairing.
|
||||
|
||||
Fixes: d5bb334a8e17 ("Bluetooth: Align minimum encryption key size for LE and BR/EDR connections")
|
||||
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
||||
Cc: stable@vger.kernel.org
|
||||
---
|
||||
net/bluetooth/hci_conn.c | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
|
||||
index 3cf0764d5793..7516cdde3373 100644
|
||||
--- a/net/bluetooth/hci_conn.c
|
||||
+++ b/net/bluetooth/hci_conn.c
|
||||
@@ -1272,8 +1272,13 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
|
||||
return 0;
|
||||
}
|
||||
|
||||
- if (hci_conn_ssp_enabled(conn) &&
|
||||
- !test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
+ /* If Secure Simple Pairing is not enabled, then legacy connection
|
||||
+ * setup is used and no encryption or key sizes can be enforced.
|
||||
+ */
|
||||
+ if (!hci_conn_ssp_enabled(conn))
|
||||
+ return 1;
|
||||
+
|
||||
+ if (!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
return 0;
|
||||
|
||||
/* The minimum encryption key size needs to be enforced by the
|
||||
--
|
||||
2.20.1
|
||||
@@ -1,30 +0,0 @@
|
||||
From dc328d75a6f37f4ff11a81ae16b1ec88c3197640 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Pagano <mpagano@gentoo.org>
|
||||
Date: Mon, 23 Mar 2020 08:20:06 -0400
|
||||
Subject: [PATCH 1/1] This driver requires REGMAP_I2C to build. Select it by
|
||||
default in Kconfig. Reported at gentoo bugzilla:
|
||||
https://bugs.gentoo.org/710790
|
||||
Cc: mpagano@gentoo.org
|
||||
|
||||
Reported-by: Phil Stracchino <phils@caerllewys.net>
|
||||
|
||||
Signed-off-by: Mike Pagano <mpagano@gentoo.org>
|
||||
---
|
||||
drivers/hwmon/Kconfig | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
|
||||
index 47ac20aee06f..530b4f29ba85 100644
|
||||
--- a/drivers/hwmon/Kconfig
|
||||
+++ b/drivers/hwmon/Kconfig
|
||||
@@ -1769,6 +1769,7 @@ config SENSORS_TMP421
|
||||
config SENSORS_TMP513
|
||||
tristate "Texas Instruments TMP513 and compatibles"
|
||||
depends on I2C
|
||||
+ select REGMAP_I2C
|
||||
help
|
||||
If you say yes here you get support for Texas Instruments TMP512,
|
||||
and TMP513 temperature and power supply sensor chips.
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/kernel/trace/bpf_trace.c 2022-11-09 13:30:24.192940988 -0500
|
||||
+++ b/kernel/trace/bpf_trace.c 2022-11-09 13:30:59.029810818 -0500
|
||||
@@ -1027,7 +1027,7 @@ static const struct bpf_func_proto bpf_g
|
||||
};
|
||||
|
||||
#ifdef CONFIG_X86_KERNEL_IBT
|
||||
-static unsigned long get_entry_ip(unsigned long fentry_ip)
|
||||
+static unsigned long __maybe_unused get_entry_ip(unsigned long fentry_ip)
|
||||
{
|
||||
u32 instr;
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
--- a/scripts/sign-file.c 2020-05-20 18:47:21.282820662 -0400
|
||||
+++ b/scripts/sign-file.c 2020-05-20 18:48:37.991081899 -0400
|
||||
@@ -41,9 +41,10 @@
|
||||
* signing with anything other than SHA1 - so we're stuck with that if such is
|
||||
* the case.
|
||||
*/
|
||||
-#if defined(LIBRESSL_VERSION_NUMBER) || \
|
||||
- OPENSSL_VERSION_NUMBER < 0x10000000L || \
|
||||
- defined(OPENSSL_NO_CMS)
|
||||
+#if defined(OPENSSL_NO_CMS) || \
|
||||
+ ( defined(LIBRESSL_VERSION_NUMBER) \
|
||||
+ && (LIBRESSL_VERSION_NUMBER < 0x3010000fL) ) || \
|
||||
+ OPENSSL_VERSION_NUMBER < 0x10000000L
|
||||
#define USE_PKCS7
|
||||
#endif
|
||||
#ifndef USE_PKCS7
|
||||
@@ -1,14 +0,0 @@
|
||||
--- a/drivers/base/firmware_loader/main.c 2021-08-24 15:42:07.025482085 -0400
|
||||
+++ b/drivers/base/firmware_loader/main.c 2021-08-24 15:44:40.782975313 -0400
|
||||
@@ -809,6 +809,11 @@ _request_firmware(const struct firmware
|
||||
|
||||
ret = _request_firmware_prepare(&fw, name, device, buf, size,
|
||||
offset, opt_flags);
|
||||
+
|
||||
+#ifdef CONFIG_GENTOO_PRINT_FIRMWARE_INFO
|
||||
+ printk(KERN_NOTICE "Loading firmware: %s\n", name);
|
||||
+#endif
|
||||
+
|
||||
if (ret <= 0) /* error or already assigned */
|
||||
goto out;
|
||||
|
||||
@@ -1,330 +0,0 @@
|
||||
--- a/Kconfig 2022-08-25 10:11:47.220973785 -0400
|
||||
+++ b/Kconfig 2022-08-25 10:11:56.997682513 -0400
|
||||
@@ -30,3 +30,5 @@ source "lib/Kconfig"
|
||||
source "lib/Kconfig.debug"
|
||||
|
||||
source "Documentation/Kconfig"
|
||||
+
|
||||
+source "distro/Kconfig"
|
||||
--- /dev/null 2022-08-25 07:13:06.694086407 -0400
|
||||
+++ b/distro/Kconfig 2022-08-25 13:21:55.150660724 -0400
|
||||
@@ -0,0 +1,291 @@
|
||||
+menu "Gentoo Linux"
|
||||
+
|
||||
+config GENTOO_LINUX
|
||||
+ bool "Gentoo Linux support"
|
||||
+
|
||||
+ default y
|
||||
+
|
||||
+ select CPU_FREQ_DEFAULT_GOV_SCHEDUTIL
|
||||
+
|
||||
+ help
|
||||
+ In order to boot Gentoo Linux a minimal set of config settings needs to
|
||||
+ be enabled in the kernel; to avoid the users from having to enable them
|
||||
+ manually as part of a Gentoo Linux installation or a new clean config,
|
||||
+ we enable these config settings by default for convenience.
|
||||
+
|
||||
+ See the settings that become available for more details and fine-tuning.
|
||||
+
|
||||
+config GENTOO_LINUX_UDEV
|
||||
+ bool "Linux dynamic and persistent device naming (userspace devfs) support"
|
||||
+
|
||||
+ depends on GENTOO_LINUX
|
||||
+ default y if GENTOO_LINUX
|
||||
+
|
||||
+ select DEVTMPFS
|
||||
+ select TMPFS
|
||||
+ select UNIX
|
||||
+
|
||||
+ select MMU
|
||||
+ select SHMEM
|
||||
+
|
||||
+ help
|
||||
+ In order to boot Gentoo Linux a minimal set of config settings needs to
|
||||
+ be enabled in the kernel; to avoid the users from having to enable them
|
||||
+ manually as part of a Gentoo Linux installation or a new clean config,
|
||||
+ we enable these config settings by default for convenience.
|
||||
+
|
||||
+ Currently this only selects TMPFS, DEVTMPFS and their dependencies.
|
||||
+ TMPFS is enabled to maintain a tmpfs file system at /dev/shm, /run and
|
||||
+ /sys/fs/cgroup; DEVTMPFS to maintain a devtmpfs file system at /dev.
|
||||
+
|
||||
+ Some of these are critical files that need to be available early in the
|
||||
+ boot process; if not available, it causes sysfs and udev to malfunction.
|
||||
+
|
||||
+ To ensure Gentoo Linux boots, it is best to leave this setting enabled;
|
||||
+ if you run a custom setup, you could consider whether to disable this.
|
||||
+
|
||||
+config GENTOO_LINUX_PORTAGE
|
||||
+ bool "Select options required by Portage features"
|
||||
+
|
||||
+ depends on GENTOO_LINUX
|
||||
+ default y if GENTOO_LINUX
|
||||
+
|
||||
+ select CGROUPS
|
||||
+ select NAMESPACES
|
||||
+ select IPC_NS
|
||||
+ select NET_NS
|
||||
+ select PID_NS
|
||||
+ select SYSVIPC
|
||||
+ select USER_NS
|
||||
+ select UTS_NS
|
||||
+
|
||||
+ help
|
||||
+ This enables options required by various Portage FEATURES.
|
||||
+ Currently this selects:
|
||||
+
|
||||
+ CGROUPS (required for FEATURES=cgroup)
|
||||
+ IPC_NS (required for FEATURES=ipc-sandbox)
|
||||
+ NET_NS (required for FEATURES=network-sandbox)
|
||||
+ PID_NS (required for FEATURES=pid-sandbox)
|
||||
+ SYSVIPC (required by IPC_NS)
|
||||
+
|
||||
+
|
||||
+ It is highly recommended that you leave this enabled as these FEATURES
|
||||
+ are, or will soon be, enabled by default.
|
||||
+
|
||||
+menu "Support for init systems, system and service managers"
|
||||
+ visible if GENTOO_LINUX
|
||||
+
|
||||
+config GENTOO_LINUX_INIT_SCRIPT
|
||||
+ bool "OpenRC, runit and other script based systems and managers"
|
||||
+
|
||||
+ default y if GENTOO_LINUX
|
||||
+
|
||||
+ depends on GENTOO_LINUX
|
||||
+
|
||||
+ select BINFMT_SCRIPT
|
||||
+ select CGROUPS
|
||||
+ select EPOLL
|
||||
+ select FILE_LOCKING
|
||||
+ select INOTIFY_USER
|
||||
+ select SIGNALFD
|
||||
+ select TIMERFD
|
||||
+
|
||||
+ help
|
||||
+ The init system is the first thing that loads after the kernel booted.
|
||||
+
|
||||
+ These config settings allow you to select which init systems to support;
|
||||
+ instead of having to select all the individual settings all over the
|
||||
+ place, these settings allows you to select all the settings at once.
|
||||
+
|
||||
+ This particular setting enables all the known requirements for OpenRC,
|
||||
+ runit and similar script based systems and managers.
|
||||
+
|
||||
+ If you are unsure about this, it is best to leave this setting enabled.
|
||||
+
|
||||
+config GENTOO_LINUX_INIT_SYSTEMD
|
||||
+ bool "systemd"
|
||||
+
|
||||
+ default n
|
||||
+
|
||||
+ depends on GENTOO_LINUX && GENTOO_LINUX_UDEV
|
||||
+
|
||||
+ select AUTOFS_FS
|
||||
+ select BLK_DEV_BSG
|
||||
+ select BPF_SYSCALL
|
||||
+ select CGROUP_BPF
|
||||
+ select CGROUPS
|
||||
+ select CRYPTO_HMAC
|
||||
+ select CRYPTO_SHA256
|
||||
+ select CRYPTO_USER_API_HASH
|
||||
+ select DEVPTS_MULTIPLE_INSTANCES
|
||||
+ select DMIID if X86_32 || X86_64 || X86
|
||||
+ select EPOLL
|
||||
+ select FANOTIFY
|
||||
+ select FHANDLE
|
||||
+ select FILE_LOCKING
|
||||
+ select INOTIFY_USER
|
||||
+ select IPV6
|
||||
+ select KCMP
|
||||
+ select NET
|
||||
+ select NET_NS
|
||||
+ select PROC_FS
|
||||
+ select SECCOMP if HAVE_ARCH_SECCOMP
|
||||
+ select SECCOMP_FILTER if HAVE_ARCH_SECCOMP_FILTER
|
||||
+ select SIGNALFD
|
||||
+ select SYSFS
|
||||
+ select TIMERFD
|
||||
+ select TMPFS_POSIX_ACL
|
||||
+ select TMPFS_XATTR
|
||||
+
|
||||
+ select ANON_INODES
|
||||
+ select BLOCK
|
||||
+ select EVENTFD
|
||||
+ select FSNOTIFY
|
||||
+ select INET
|
||||
+ select NLATTR
|
||||
+
|
||||
+ help
|
||||
+ The init system is the first thing that loads after the kernel booted.
|
||||
+
|
||||
+ These config settings allow you to select which init systems to support;
|
||||
+ instead of having to select all the individual settings all over the
|
||||
+ place, these settings allows you to select all the settings at once.
|
||||
+
|
||||
+ This particular setting enables all the known requirements for systemd;
|
||||
+ it also enables suggested optional settings, as the package suggests to.
|
||||
+
|
||||
+endmenu
|
||||
+
|
||||
+menuconfig GENTOO_KERNEL_SELF_PROTECTION
|
||||
+ bool "Kernel Self Protection Project"
|
||||
+ depends on GENTOO_LINUX
|
||||
+ help
|
||||
+ Recommended Kernel settings based on the suggestions from the Kernel Self Protection Project
|
||||
+ See: https://kernsec.org/wiki/index.php/Kernel_Self_Protection_Project/Recommended_Settings
|
||||
+ Note, there may be additional settings for which the CONFIG_ setting is invisible in menuconfig due
|
||||
+ to unmet dependencies. Search for GENTOO_KERNEL_SELF_PROTECTION_COMMON and search for
|
||||
+ GENTOO_KERNEL_SELF_PROTECTION_{X86_64, ARM64, X86_32, ARM} for dependency information on your
|
||||
+ specific architecture.
|
||||
+ Note 2: Please see the URL above for numeric settings, e.g. CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
|
||||
+ for X86_64
|
||||
+
|
||||
+if GENTOO_KERNEL_SELF_PROTECTION
|
||||
+config GENTOO_KERNEL_SELF_PROTECTION_COMMON
|
||||
+ bool "Enable Kernel Self Protection Project Recommendations"
|
||||
+
|
||||
+ depends on GENTOO_LINUX && !ACPI_CUSTOM_METHOD && !COMPAT_BRK && !PROC_KCORE && !COMPAT_VDSO && !KEXEC && !HIBERNATION && !LEGACY_PTYS && !X86_X32_ABI && !MODIFY_LDT_SYSCALL && GCC_PLUGINS && !IOMMU_DEFAULT_DMA_LAZY && !IOMMU_DEFAULT_PASSTHROUGH && IOMMU_DEFAULT_DMA_STRICT && SECURITY && !ARCH_EPHEMERAL_INODES && RANDSTRUCT_PERFORMANCE
|
||||
+
|
||||
+ select BUG
|
||||
+ select STRICT_KERNEL_RWX
|
||||
+ select DEBUG_WX
|
||||
+ select STACKPROTECTOR
|
||||
+ select STACKPROTECTOR_STRONG
|
||||
+ select STRICT_DEVMEM if DEVMEM=y
|
||||
+ select IO_STRICT_DEVMEM if DEVMEM=y
|
||||
+ select SYN_COOKIES
|
||||
+ select DEBUG_CREDENTIALS
|
||||
+ select DEBUG_NOTIFIERS
|
||||
+ select DEBUG_LIST
|
||||
+ select DEBUG_SG
|
||||
+ select HARDENED_USERCOPY if HAVE_HARDENED_USERCOPY_ALLOCATOR=y
|
||||
+ select KFENCE if HAVE_ARCH_KFENCE && (!SLAB || SLUB)
|
||||
+ select RANDOMIZE_KSTACK_OFFSET_DEFAULT if HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET && (INIT_STACK_NONE || !CC_IS_CLANG || CLANG_VERSION>=140000)
|
||||
+ select SECURITY_LANDLOCK
|
||||
+ select SCHED_CORE if SCHED_SMT
|
||||
+ select BUG_ON_DATA_CORRUPTION
|
||||
+ select SCHED_STACK_END_CHECK
|
||||
+ select SECCOMP if HAVE_ARCH_SECCOMP
|
||||
+ select SECCOMP_FILTER if HAVE_ARCH_SECCOMP_FILTER
|
||||
+ select SECURITY_YAMA
|
||||
+ select SLAB_FREELIST_RANDOM
|
||||
+ select SLAB_FREELIST_HARDENED
|
||||
+ select SHUFFLE_PAGE_ALLOCATOR
|
||||
+ select SLUB_DEBUG
|
||||
+ select PAGE_POISONING
|
||||
+ select PAGE_POISONING_NO_SANITY
|
||||
+ select PAGE_POISONING_ZERO
|
||||
+ select INIT_ON_ALLOC_DEFAULT_ON
|
||||
+ select INIT_ON_FREE_DEFAULT_ON
|
||||
+ select REFCOUNT_FULL
|
||||
+ select FORTIFY_SOURCE
|
||||
+ select SECURITY_DMESG_RESTRICT
|
||||
+ select PANIC_ON_OOPS
|
||||
+ select GCC_PLUGIN_LATENT_ENTROPY
|
||||
+ select GCC_PLUGIN_STRUCTLEAK
|
||||
+ select GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
|
||||
+ select GCC_PLUGIN_RANDSTRUCT
|
||||
+ select GCC_PLUGIN_RANDSTRUCT_PERFORMANCE
|
||||
+ select ZERO_CALL_USED_REGS if CC_HAS_ZERO_CALL_USED_REGS
|
||||
+
|
||||
+ help
|
||||
+ Search for GENTOO_KERNEL_SELF_PROTECTION_{X86_64, ARM64, X86_32, ARM} for dependency
|
||||
+ information on your specific architecture. Note 2: Please see the URL above for
|
||||
+ numeric settings, e.g. CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 for X86_64
|
||||
+
|
||||
+config GENTOO_KERNEL_SELF_PROTECTION_X86_64
|
||||
+ bool "X86_64 KSPP Settings" if GENTOO_KERNEL_SELF_PROTECTION_COMMON
|
||||
+
|
||||
+ depends on !X86_MSR && X86_64 && GENTOO_KERNEL_SELF_PROTECTION
|
||||
+ default n
|
||||
+
|
||||
+ select GCC_PLUGIN_STACKLEAK
|
||||
+ select LEGACY_VSYSCALL_NONE
|
||||
+ select PAGE_TABLE_ISOLATION
|
||||
+ select RANDOMIZE_BASE
|
||||
+ select RANDOMIZE_MEMORY
|
||||
+ select RELOCATABLE
|
||||
+ select VMAP_STACK
|
||||
+
|
||||
+
|
||||
+config GENTOO_KERNEL_SELF_PROTECTION_ARM64
|
||||
+ bool "ARM64 KSPP Settings"
|
||||
+
|
||||
+ depends on ARM64
|
||||
+ default n
|
||||
+
|
||||
+ select RANDOMIZE_BASE
|
||||
+ select RELOCATABLE
|
||||
+ select ARM64_SW_TTBR0_PAN
|
||||
+ select CONFIG_UNMAP_KERNEL_AT_EL0
|
||||
+ select GCC_PLUGIN_STACKLEAK
|
||||
+ select VMAP_STACK
|
||||
+
|
||||
+config GENTOO_KERNEL_SELF_PROTECTION_X86_32
|
||||
+ bool "X86_32 KSPP Settings"
|
||||
+
|
||||
+ depends on !X86_MSR && !MODIFY_LDT_SYSCALL && !M486 && X86_32
|
||||
+ default n
|
||||
+
|
||||
+ select HIGHMEM64G
|
||||
+ select X86_PAE
|
||||
+ select RANDOMIZE_BASE
|
||||
+ select RELOCATABLE
|
||||
+ select PAGE_TABLE_ISOLATION
|
||||
+
|
||||
+config GENTOO_KERNEL_SELF_PROTECTION_ARM
|
||||
+ bool "ARM KSPP Settings"
|
||||
+
|
||||
+ depends on !OABI_COMPAT && ARM
|
||||
+ default n
|
||||
+
|
||||
+ select VMSPLIT_3G
|
||||
+ select STRICT_MEMORY_RWX
|
||||
+ select CPU_SW_DOMAIN_PAN
|
||||
+
|
||||
+endif
|
||||
+
|
||||
+config GENTOO_PRINT_FIRMWARE_INFO
|
||||
+ bool "Print firmware information that the kernel attempts to load"
|
||||
+
|
||||
+ depends on GENTOO_LINUX
|
||||
+ default y
|
||||
+
|
||||
+ help
|
||||
+ Enable this option to print information about firmware that the kernel
|
||||
+ is attempting to load. This information can be accessible via the
|
||||
+ dmesg command-line utility
|
||||
+
|
||||
+ See the settings that become available for more details and fine-tuning.
|
||||
+
|
||||
+endmenu
|
||||
--
|
||||
2.31.1
|
||||
|
||||
From bd3ff0b16792c18c0614c2b95e148943209f460a Mon Sep 17 00:00:00 2001
|
||||
From: Georgy Yakovlev <gyakovlev@gentoo.org>
|
||||
Date: Tue, 8 Jun 2021 13:59:57 -0700
|
||||
Subject: [PATCH 2/2] set DEFAULT_MMAP_MIN_ADDR by default
|
||||
|
||||
---
|
||||
mm/Kconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/mm/Kconfig b/mm/Kconfig
|
||||
index 24c045b24..e13fc740c 100644
|
||||
--- a/mm/Kconfig
|
||||
+++ b/mm/Kconfig
|
||||
@@ -321,6 +321,8 @@ config KSM
|
||||
config DEFAULT_MMAP_MIN_ADDR
|
||||
int "Low address space to protect from user allocation"
|
||||
depends on MMU
|
||||
+ default 65536 if ( X86_64 || X86_32 || PPC64 || IA64 ) && GENTOO_KERNEL_SELF_PROTECTION
|
||||
+ default 32768 if ( ARM64 || ARM ) && GENTOO_KERNEL_SELF_PROTECTION
|
||||
default 4096
|
||||
help
|
||||
This is the portion of low virtual memory which should be protected
|
||||
--
|
||||
2.31.1
|
||||
```
|
||||
@@ -1,789 +0,0 @@
|
||||
From 70d4906b87983ed2ed5da78930a701625d881dd0 Mon Sep 17 00:00:00 2001
|
||||
From: graysky <therealgraysky@proton.me>
|
||||
Date: Thu, 5 Jan 2023 14:29:37 -0500
|
||||
|
||||
FEATURES
|
||||
This patch adds additional CPU options to the Linux kernel accessible under:
|
||||
Processor type and features --->
|
||||
Processor family --->
|
||||
|
||||
With the release of gcc 11.1 and clang 12.0, several generic 64-bit levels are
|
||||
offered which are good for supported Intel or AMD CPUs:
|
||||
• x86-64-v2
|
||||
• x86-64-v3
|
||||
• x86-64-v4
|
||||
|
||||
Users of glibc 2.33 and above can see which level is supported by current
|
||||
hardware by running:
|
||||
/lib/ld-linux-x86-64.so.2 --help | grep supported
|
||||
|
||||
Alternatively, compare the flags from /proc/cpuinfo to this list.[1]
|
||||
|
||||
CPU-specific microarchitectures include:
|
||||
• AMD Improved K8-family
|
||||
• AMD K10-family
|
||||
• AMD Family 10h (Barcelona)
|
||||
• AMD Family 14h (Bobcat)
|
||||
• AMD Family 16h (Jaguar)
|
||||
• AMD Family 15h (Bulldozer)
|
||||
• AMD Family 15h (Piledriver)
|
||||
• AMD Family 15h (Steamroller)
|
||||
• AMD Family 15h (Excavator)
|
||||
• AMD Family 17h (Zen)
|
||||
• AMD Family 17h (Zen 2)
|
||||
• AMD Family 19h (Zen 3)†
|
||||
• AMD Family 19h (Zen 4)§
|
||||
• Intel Silvermont low-power processors
|
||||
• Intel Goldmont low-power processors (Apollo Lake and Denverton)
|
||||
• Intel Goldmont Plus low-power processors (Gemini Lake)
|
||||
• Intel 1st Gen Core i3/i5/i7 (Nehalem)
|
||||
• Intel 1.5 Gen Core i3/i5/i7 (Westmere)
|
||||
• Intel 2nd Gen Core i3/i5/i7 (Sandybridge)
|
||||
• Intel 3rd Gen Core i3/i5/i7 (Ivybridge)
|
||||
• Intel 4th Gen Core i3/i5/i7 (Haswell)
|
||||
• Intel 5th Gen Core i3/i5/i7 (Broadwell)
|
||||
• Intel 6th Gen Core i3/i5/i7 (Skylake)
|
||||
• Intel 6th Gen Core i7/i9 (Skylake X)
|
||||
• Intel 8th Gen Core i3/i5/i7 (Cannon Lake)
|
||||
• Intel 10th Gen Core i7/i9 (Ice Lake)
|
||||
• Intel Xeon (Cascade Lake)
|
||||
• Intel Xeon (Cooper Lake)*
|
||||
• Intel 3rd Gen 10nm++ i3/i5/i7/i9-family (Tiger Lake)*
|
||||
• Intel 4th Gen 10nm++ Xeon (Sapphire Rapids)‡
|
||||
• Intel 11th Gen i3/i5/i7/i9-family (Rocket Lake)‡
|
||||
• Intel 12th Gen i3/i5/i7/i9-family (Alder Lake)‡
|
||||
• Intel 13th Gen i3/i5/i7/i9-family (Raptor Lake)§
|
||||
• Intel 14th Gen i3/i5/i7/i9-family (Meteor Lake)§
|
||||
• Intel 5th Gen 10nm++ Xeon (Emerald Rapids)§
|
||||
|
||||
Notes: If not otherwise noted, gcc >=9.1 is required for support.
|
||||
*Requires gcc >=10.1 or clang >=10.0
|
||||
†Required gcc >=10.3 or clang >=12.0
|
||||
‡Required gcc >=11.1 or clang >=12.0
|
||||
§Required gcc >=13.0 or clang >=15.0.5
|
||||
|
||||
It also offers to compile passing the 'native' option which, "selects the CPU
|
||||
to generate code for at compilation time by determining the processor type of
|
||||
the compiling machine. Using -march=native enables all instruction subsets
|
||||
supported by the local machine and will produce code optimized for the local
|
||||
machine under the constraints of the selected instruction set."[2]
|
||||
|
||||
Users of Intel CPUs should select the 'Intel-Native' option and users of AMD
|
||||
CPUs should select the 'AMD-Native' option.
|
||||
|
||||
MINOR NOTES RELATING TO INTEL ATOM PROCESSORS
|
||||
This patch also changes -march=atom to -march=bonnell in accordance with the
|
||||
gcc v4.9 changes. Upstream is using the deprecated -match=atom flags when I
|
||||
believe it should use the newer -march=bonnell flag for atom processors.[3]
|
||||
|
||||
It is not recommended to compile on Atom-CPUs with the 'native' option.[4] The
|
||||
recommendation is to use the 'atom' option instead.
|
||||
|
||||
BENEFITS
|
||||
Small but real speed increases are measurable using a make endpoint comparing
|
||||
a generic kernel to one built with one of the respective microarchs.
|
||||
|
||||
See the following experimental evidence supporting this statement:
|
||||
https://github.com/graysky2/kernel_gcc_patch
|
||||
|
||||
REQUIREMENTS
|
||||
linux version 5.17+
|
||||
gcc version >=9.0 or clang version >=9.0
|
||||
|
||||
ACKNOWLEDGMENTS
|
||||
This patch builds on the seminal work by Jeroen.[5]
|
||||
|
||||
REFERENCES
|
||||
1. https://gitlab.com/x86-psABIs/x86-64-ABI/-/commit/77566eb03bc6a326811cb7e9
|
||||
2. https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html#index-x86-Options
|
||||
3. https://bugzilla.kernel.org/show_bug.cgi?id=77461
|
||||
4. https://github.com/graysky2/kernel_gcc_patch/issues/15
|
||||
5. http://www.linuxforge.net/docs/linux/linux-gcc.php
|
||||
---
|
||||
arch/x86/Kconfig.cpu | 427 ++++++++++++++++++++++++++++++--
|
||||
arch/x86/Makefile | 44 +++-
|
||||
arch/x86/include/asm/vermagic.h | 74 ++++++
|
||||
3 files changed, 528 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
|
||||
index 542377cd419d..f589971df2d3 100644
|
||||
--- a/arch/x86/Kconfig.cpu
|
||||
+++ b/arch/x86/Kconfig.cpu
|
||||
@@ -157,7 +157,7 @@ config MPENTIUM4
|
||||
|
||||
|
||||
config MK6
|
||||
- bool "K6/K6-II/K6-III"
|
||||
+ bool "AMD K6/K6-II/K6-III"
|
||||
depends on X86_32
|
||||
help
|
||||
Select this for an AMD K6-family processor. Enables use of
|
||||
@@ -165,7 +165,7 @@ config MK6
|
||||
flags to GCC.
|
||||
|
||||
config MK7
|
||||
- bool "Athlon/Duron/K7"
|
||||
+ bool "AMD Athlon/Duron/K7"
|
||||
depends on X86_32
|
||||
help
|
||||
Select this for an AMD Athlon K7-family processor. Enables use of
|
||||
@@ -173,12 +173,106 @@ config MK7
|
||||
flags to GCC.
|
||||
|
||||
config MK8
|
||||
- bool "Opteron/Athlon64/Hammer/K8"
|
||||
+ bool "AMD Opteron/Athlon64/Hammer/K8"
|
||||
help
|
||||
Select this for an AMD Opteron or Athlon64 Hammer-family processor.
|
||||
Enables use of some extended instructions, and passes appropriate
|
||||
optimization flags to GCC.
|
||||
|
||||
+config MK8SSE3
|
||||
+ bool "AMD Opteron/Athlon64/Hammer/K8 with SSE3"
|
||||
+ help
|
||||
+ Select this for improved AMD Opteron or Athlon64 Hammer-family processors.
|
||||
+ Enables use of some extended instructions, and passes appropriate
|
||||
+ optimization flags to GCC.
|
||||
+
|
||||
+config MK10
|
||||
+ bool "AMD 61xx/7x50/PhenomX3/X4/II/K10"
|
||||
+ help
|
||||
+ Select this for an AMD 61xx Eight-Core Magny-Cours, Athlon X2 7x50,
|
||||
+ Phenom X3/X4/II, Athlon II X2/X3/X4, or Turion II-family processor.
|
||||
+ Enables use of some extended instructions, and passes appropriate
|
||||
+ optimization flags to GCC.
|
||||
+
|
||||
+config MBARCELONA
|
||||
+ bool "AMD Barcelona"
|
||||
+ help
|
||||
+ Select this for AMD Family 10h Barcelona processors.
|
||||
+
|
||||
+ Enables -march=barcelona
|
||||
+
|
||||
+config MBOBCAT
|
||||
+ bool "AMD Bobcat"
|
||||
+ help
|
||||
+ Select this for AMD Family 14h Bobcat processors.
|
||||
+
|
||||
+ Enables -march=btver1
|
||||
+
|
||||
+config MJAGUAR
|
||||
+ bool "AMD Jaguar"
|
||||
+ help
|
||||
+ Select this for AMD Family 16h Jaguar processors.
|
||||
+
|
||||
+ Enables -march=btver2
|
||||
+
|
||||
+config MBULLDOZER
|
||||
+ bool "AMD Bulldozer"
|
||||
+ help
|
||||
+ Select this for AMD Family 15h Bulldozer processors.
|
||||
+
|
||||
+ Enables -march=bdver1
|
||||
+
|
||||
+config MPILEDRIVER
|
||||
+ bool "AMD Piledriver"
|
||||
+ help
|
||||
+ Select this for AMD Family 15h Piledriver processors.
|
||||
+
|
||||
+ Enables -march=bdver2
|
||||
+
|
||||
+config MSTEAMROLLER
|
||||
+ bool "AMD Steamroller"
|
||||
+ help
|
||||
+ Select this for AMD Family 15h Steamroller processors.
|
||||
+
|
||||
+ Enables -march=bdver3
|
||||
+
|
||||
+config MEXCAVATOR
|
||||
+ bool "AMD Excavator"
|
||||
+ help
|
||||
+ Select this for AMD Family 15h Excavator processors.
|
||||
+
|
||||
+ Enables -march=bdver4
|
||||
+
|
||||
+config MZEN
|
||||
+ bool "AMD Zen"
|
||||
+ help
|
||||
+ Select this for AMD Family 17h Zen processors.
|
||||
+
|
||||
+ Enables -march=znver1
|
||||
+
|
||||
+config MZEN2
|
||||
+ bool "AMD Zen 2"
|
||||
+ help
|
||||
+ Select this for AMD Family 17h Zen 2 processors.
|
||||
+
|
||||
+ Enables -march=znver2
|
||||
+
|
||||
+config MZEN3
|
||||
+ bool "AMD Zen 3"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION >= 100300) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||
+ help
|
||||
+ Select this for AMD Family 19h Zen 3 processors.
|
||||
+
|
||||
+ Enables -march=znver3
|
||||
+
|
||||
+config MZEN4
|
||||
+ bool "AMD Zen 4"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 160000)
|
||||
+ help
|
||||
+ Select this for AMD Family 19h Zen 4 processors.
|
||||
+
|
||||
+ Enables -march=znver4
|
||||
+
|
||||
config MCRUSOE
|
||||
bool "Crusoe"
|
||||
depends on X86_32
|
||||
@@ -270,7 +364,7 @@ config MPSC
|
||||
in /proc/cpuinfo. Family 15 is an older Xeon, Family 6 a newer one.
|
||||
|
||||
config MCORE2
|
||||
- bool "Core 2/newer Xeon"
|
||||
+ bool "Intel Core 2"
|
||||
help
|
||||
|
||||
Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and
|
||||
@@ -278,6 +372,8 @@ config MCORE2
|
||||
family in /proc/cpuinfo. Newer ones have 6 and older ones 15
|
||||
(not a typo)
|
||||
|
||||
+ Enables -march=core2
|
||||
+
|
||||
config MATOM
|
||||
bool "Intel Atom"
|
||||
help
|
||||
@@ -287,6 +383,212 @@ config MATOM
|
||||
accordingly optimized code. Use a recent GCC with specific Atom
|
||||
support in order to fully benefit from selecting this option.
|
||||
|
||||
+config MNEHALEM
|
||||
+ bool "Intel Nehalem"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 1st Gen Core processors in the Nehalem family.
|
||||
+
|
||||
+ Enables -march=nehalem
|
||||
+
|
||||
+config MWESTMERE
|
||||
+ bool "Intel Westmere"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for the Intel Westmere formerly Nehalem-C family.
|
||||
+
|
||||
+ Enables -march=westmere
|
||||
+
|
||||
+config MSILVERMONT
|
||||
+ bool "Intel Silvermont"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for the Intel Silvermont platform.
|
||||
+
|
||||
+ Enables -march=silvermont
|
||||
+
|
||||
+config MGOLDMONT
|
||||
+ bool "Intel Goldmont"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for the Intel Goldmont platform including Apollo Lake and Denverton.
|
||||
+
|
||||
+ Enables -march=goldmont
|
||||
+
|
||||
+config MGOLDMONTPLUS
|
||||
+ bool "Intel Goldmont Plus"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for the Intel Goldmont Plus platform including Gemini Lake.
|
||||
+
|
||||
+ Enables -march=goldmont-plus
|
||||
+
|
||||
+config MSANDYBRIDGE
|
||||
+ bool "Intel Sandy Bridge"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 2nd Gen Core processors in the Sandy Bridge family.
|
||||
+
|
||||
+ Enables -march=sandybridge
|
||||
+
|
||||
+config MIVYBRIDGE
|
||||
+ bool "Intel Ivy Bridge"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 3rd Gen Core processors in the Ivy Bridge family.
|
||||
+
|
||||
+ Enables -march=ivybridge
|
||||
+
|
||||
+config MHASWELL
|
||||
+ bool "Intel Haswell"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 4th Gen Core processors in the Haswell family.
|
||||
+
|
||||
+ Enables -march=haswell
|
||||
+
|
||||
+config MBROADWELL
|
||||
+ bool "Intel Broadwell"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 5th Gen Core processors in the Broadwell family.
|
||||
+
|
||||
+ Enables -march=broadwell
|
||||
+
|
||||
+config MSKYLAKE
|
||||
+ bool "Intel Skylake"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 6th Gen Core processors in the Skylake family.
|
||||
+
|
||||
+ Enables -march=skylake
|
||||
+
|
||||
+config MSKYLAKEX
|
||||
+ bool "Intel Skylake X"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 6th Gen Core processors in the Skylake X family.
|
||||
+
|
||||
+ Enables -march=skylake-avx512
|
||||
+
|
||||
+config MCANNONLAKE
|
||||
+ bool "Intel Cannon Lake"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 8th Gen Core processors
|
||||
+
|
||||
+ Enables -march=cannonlake
|
||||
+
|
||||
+config MICELAKE
|
||||
+ bool "Intel Ice Lake"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for 10th Gen Core processors in the Ice Lake family.
|
||||
+
|
||||
+ Enables -march=icelake-client
|
||||
+
|
||||
+config MCASCADELAKE
|
||||
+ bool "Intel Cascade Lake"
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for Xeon processors in the Cascade Lake family.
|
||||
+
|
||||
+ Enables -march=cascadelake
|
||||
+
|
||||
+config MCOOPERLAKE
|
||||
+ bool "Intel Cooper Lake"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 100100) || (CC_IS_CLANG && CLANG_VERSION >= 100000)
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for Xeon processors in the Cooper Lake family.
|
||||
+
|
||||
+ Enables -march=cooperlake
|
||||
+
|
||||
+config MTIGERLAKE
|
||||
+ bool "Intel Tiger Lake"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 100100) || (CC_IS_CLANG && CLANG_VERSION >= 100000)
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for third-generation 10 nm process processors in the Tiger Lake family.
|
||||
+
|
||||
+ Enables -march=tigerlake
|
||||
+
|
||||
+config MSAPPHIRERAPIDS
|
||||
+ bool "Intel Sapphire Rapids"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for fourth-generation 10 nm process processors in the Sapphire Rapids family.
|
||||
+
|
||||
+ Enables -march=sapphirerapids
|
||||
+
|
||||
+config MROCKETLAKE
|
||||
+ bool "Intel Rocket Lake"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for eleventh-generation processors in the Rocket Lake family.
|
||||
+
|
||||
+ Enables -march=rocketlake
|
||||
+
|
||||
+config MALDERLAKE
|
||||
+ bool "Intel Alder Lake"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for twelfth-generation processors in the Alder Lake family.
|
||||
+
|
||||
+ Enables -march=alderlake
|
||||
+
|
||||
+config MRAPTORLAKE
|
||||
+ bool "Intel Raptor Lake"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for thirteenth-generation processors in the Raptor Lake family.
|
||||
+
|
||||
+ Enables -march=raptorlake
|
||||
+
|
||||
+config MMETEORLAKE
|
||||
+ bool "Intel Meteor Lake"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION >= 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for fourteenth-generation processors in the Meteor Lake family.
|
||||
+
|
||||
+ Enables -march=meteorlake
|
||||
+
|
||||
+config MEMERALDRAPIDS
|
||||
+ bool "Intel Emerald Rapids"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 130000) || (CC_IS_CLANG && CLANG_VERSION >= 150500)
|
||||
+ select X86_P6_NOP
|
||||
+ help
|
||||
+
|
||||
+ Select this for fifth-generation 10 nm process processors in the Emerald Rapids family.
|
||||
+
|
||||
+ Enables -march=emeraldrapids
|
||||
+
|
||||
config GENERIC_CPU
|
||||
bool "Generic-x86-64"
|
||||
depends on X86_64
|
||||
@@ -294,6 +596,50 @@ config GENERIC_CPU
|
||||
Generic x86-64 CPU.
|
||||
Run equally well on all x86-64 CPUs.
|
||||
|
||||
+config GENERIC_CPU2
|
||||
+ bool "Generic-x86-64-v2"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||
+ depends on X86_64
|
||||
+ help
|
||||
+ Generic x86-64 CPU.
|
||||
+ Run equally well on all x86-64 CPUs with min support of x86-64-v2.
|
||||
+
|
||||
+config GENERIC_CPU3
|
||||
+ bool "Generic-x86-64-v3"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||
+ depends on X86_64
|
||||
+ help
|
||||
+ Generic x86-64-v3 CPU with v3 instructions.
|
||||
+ Run equally well on all x86-64 CPUs with min support of x86-64-v3.
|
||||
+
|
||||
+config GENERIC_CPU4
|
||||
+ bool "Generic-x86-64-v4"
|
||||
+ depends on (CC_IS_GCC && GCC_VERSION > 110000) || (CC_IS_CLANG && CLANG_VERSION >= 120000)
|
||||
+ depends on X86_64
|
||||
+ help
|
||||
+ Generic x86-64 CPU with v4 instructions.
|
||||
+ Run equally well on all x86-64 CPUs with min support of x86-64-v4.
|
||||
+
|
||||
+config MNATIVE_INTEL
|
||||
+ bool "Intel-Native optimizations autodetected by the compiler"
|
||||
+ help
|
||||
+
|
||||
+ Clang 3.8, GCC 4.2 and above support -march=native, which automatically detects
|
||||
+ the optimum settings to use based on your processor. Do NOT use this
|
||||
+ for AMD CPUs. Intel Only!
|
||||
+
|
||||
+ Enables -march=native
|
||||
+
|
||||
+config MNATIVE_AMD
|
||||
+ bool "AMD-Native optimizations autodetected by the compiler"
|
||||
+ help
|
||||
+
|
||||
+ Clang 3.8, GCC 4.2 and above support -march=native, which automatically detects
|
||||
+ the optimum settings to use based on your processor. Do NOT use this
|
||||
+ for Intel CPUs. AMD Only!
|
||||
+
|
||||
+ Enables -march=native
|
||||
+
|
||||
endchoice
|
||||
|
||||
config X86_GENERIC
|
||||
@@ -318,9 +664,17 @@ config X86_INTERNODE_CACHE_SHIFT
|
||||
config X86_L1_CACHE_SHIFT
|
||||
int
|
||||
default "7" if MPENTIUM4 || MPSC
|
||||
- default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU
|
||||
+ default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || MK8SSE3 || MK10 \
|
||||
+ || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER \
|
||||
+ || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM || MWESTMERE || MSILVERMONT \
|
||||
+ || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL \
|
||||
+ || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE \
|
||||
+ || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE \
|
||||
+ || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD || X86_GENERIC || GENERIC_CPU || GENERIC_CPU2 \
|
||||
+ || GENERIC_CPU3 || GENERIC_CPU4
|
||||
default "4" if MELAN || M486SX || M486 || MGEODEGX1
|
||||
- default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
|
||||
+ default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII \
|
||||
+ || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
|
||||
|
||||
config X86_F00F_BUG
|
||||
def_bool y
|
||||
@@ -332,15 +686,27 @@ config X86_INVD_BUG
|
||||
|
||||
config X86_ALIGNMENT_16
|
||||
def_bool y
|
||||
- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486SX || M486 || MVIAC3_2 || MGEODEGX1
|
||||
+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC \
|
||||
+ || M586 || M486SX || M486 || MVIAC3_2 || MGEODEGX1
|
||||
|
||||
config X86_INTEL_USERCOPY
|
||||
def_bool y
|
||||
- depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC || MK8 || MK7 || MEFFICEON || MCORE2
|
||||
+ depends on MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M586MMX || X86_GENERIC \
|
||||
+ || MK8 || MK7 || MEFFICEON || MCORE2 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT \
|
||||
+ || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX \
|
||||
+ || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS \
|
||||
+ || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL
|
||||
|
||||
config X86_USE_PPRO_CHECKSUM
|
||||
def_bool y
|
||||
- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX || MCORE2 || MATOM
|
||||
+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM \
|
||||
+ || MPENTIUMIII || MPENTIUMII || M686 || MK8 || MVIAC3_2 || MVIAC7 || MEFFICEON || MGEODE_LX \
|
||||
+ || MCORE2 || MATOM || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER \
|
||||
+ || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM \
|
||||
+ || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE \
|
||||
+ || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE \
|
||||
+ || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE \
|
||||
+ || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD
|
||||
|
||||
#
|
||||
# P6_NOPs are a relatively minor optimization that require a family >=
|
||||
@@ -356,32 +722,63 @@ config X86_USE_PPRO_CHECKSUM
|
||||
config X86_P6_NOP
|
||||
def_bool y
|
||||
depends on X86_64
|
||||
- depends on (MCORE2 || MPENTIUM4 || MPSC)
|
||||
+ depends on (MCORE2 || MPENTIUM4 || MPSC || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT \
|
||||
+ || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE \
|
||||
+ || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE \
|
||||
+ || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS \
|
||||
+ || MNATIVE_INTEL)
|
||||
|
||||
config X86_TSC
|
||||
def_bool y
|
||||
- depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 || MGEODE_LX || MCORE2 || MATOM) || X86_64
|
||||
+ depends on (MWINCHIP3D || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM \
|
||||
+ || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MVIAC7 || MGEODEGX1 \
|
||||
+ || MGEODE_LX || MCORE2 || MATOM || MK8SSE3 || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER \
|
||||
+ || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM \
|
||||
+ || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL \
|
||||
+ || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE \
|
||||
+ || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS \
|
||||
+ || MNATIVE_INTEL || MNATIVE_AMD) || X86_64
|
||||
|
||||
config X86_CMPXCHG64
|
||||
def_bool y
|
||||
- depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586TSC || M586MMX || MATOM || MGEODE_LX || MGEODEGX1 || MK6 || MK7 || MK8
|
||||
+ depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 \
|
||||
+ || M586TSC || M586MMX || MATOM || MGEODE_LX || MGEODEGX1 || MK6 || MK7 || MK8 || MK8SSE3 || MK10 \
|
||||
+ || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR || MZEN \
|
||||
+ || MZEN2 || MZEN3 || MZEN4 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT || MGOLDMONTPLUS \
|
||||
+ || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX || MCANNONLAKE \
|
||||
+ || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE \
|
||||
+ || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD
|
||||
|
||||
# this should be set for all -march=.. options where the compiler
|
||||
# generates cmov.
|
||||
config X86_CMOV
|
||||
def_bool y
|
||||
- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
|
||||
+ depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 \
|
||||
+ || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX || MK8SSE3 || MK10 \
|
||||
+ || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER || MEXCAVATOR \
|
||||
+ || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM || MWESTMERE || MSILVERMONT || MGOLDMONT \
|
||||
+ || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL || MSKYLAKE || MSKYLAKEX \
|
||||
+ || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE || MTIGERLAKE || MSAPPHIRERAPIDS \
|
||||
+ || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MMETEORLAKE || MEMERALDRAPIDS || MNATIVE_INTEL || MNATIVE_AMD)
|
||||
|
||||
config X86_MINIMUM_CPU_FAMILY
|
||||
int
|
||||
default "64" if X86_64
|
||||
- default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8)
|
||||
+ default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 \
|
||||
+ || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8 || MK8SSE3 \
|
||||
+ || MK10 || MBARCELONA || MBOBCAT || MJAGUAR || MBULLDOZER || MPILEDRIVER || MSTEAMROLLER \
|
||||
+ || MEXCAVATOR || MZEN || MZEN2 || MZEN3 || MZEN4 || MNEHALEM || MWESTMERE || MSILVERMONT \
|
||||
+ || MGOLDMONT || MGOLDMONTPLUS || MSANDYBRIDGE || MIVYBRIDGE || MHASWELL || MBROADWELL \
|
||||
+ || MSKYLAKE || MSKYLAKEX || MCANNONLAKE || MICELAKE || MCASCADELAKE || MCOOPERLAKE \
|
||||
+ || MTIGERLAKE || MSAPPHIRERAPIDS || MROCKETLAKE || MALDERLAKE || MRAPTORLAKE || MRAPTORLAKE \
|
||||
+ || MNATIVE_INTEL || MNATIVE_AMD)
|
||||
default "5" if X86_32 && X86_CMPXCHG64
|
||||
default "4"
|
||||
|
||||
config X86_DEBUGCTLMSR
|
||||
def_bool y
|
||||
- depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486SX || M486) && !UML
|
||||
+ depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 \
|
||||
+ || M486SX || M486) && !UML
|
||||
|
||||
config IA32_FEAT_CTL
|
||||
def_bool y
|
||||
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
|
||||
index 415a5d138de4..17b1e039d955 100644
|
||||
--- a/arch/x86/Makefile
|
||||
+++ b/arch/x86/Makefile
|
||||
@@ -151,8 +151,48 @@ else
|
||||
# FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
|
||||
cflags-$(CONFIG_MK8) += -march=k8
|
||||
cflags-$(CONFIG_MPSC) += -march=nocona
|
||||
- cflags-$(CONFIG_MCORE2) += -march=core2
|
||||
- cflags-$(CONFIG_MATOM) += -march=atom
|
||||
+ cflags-$(CONFIG_MK8SSE3) += -march=k8-sse3
|
||||
+ cflags-$(CONFIG_MK10) += -march=amdfam10
|
||||
+ cflags-$(CONFIG_MBARCELONA) += -march=barcelona
|
||||
+ cflags-$(CONFIG_MBOBCAT) += -march=btver1
|
||||
+ cflags-$(CONFIG_MJAGUAR) += -march=btver2
|
||||
+ cflags-$(CONFIG_MBULLDOZER) += -march=bdver1
|
||||
+ cflags-$(CONFIG_MPILEDRIVER) += -march=bdver2 -mno-tbm
|
||||
+ cflags-$(CONFIG_MSTEAMROLLER) += -march=bdver3 -mno-tbm
|
||||
+ cflags-$(CONFIG_MEXCAVATOR) += -march=bdver4 -mno-tbm
|
||||
+ cflags-$(CONFIG_MZEN) += -march=znver1
|
||||
+ cflags-$(CONFIG_MZEN2) += -march=znver2
|
||||
+ cflags-$(CONFIG_MZEN3) += -march=znver3
|
||||
+ cflags-$(CONFIG_MZEN4) += -march=znver4
|
||||
+ cflags-$(CONFIG_MNATIVE_INTEL) += -march=native
|
||||
+ cflags-$(CONFIG_MNATIVE_AMD) += -march=native
|
||||
+ cflags-$(CONFIG_MATOM) += -march=bonnell
|
||||
+ cflags-$(CONFIG_MCORE2) += -march=core2
|
||||
+ cflags-$(CONFIG_MNEHALEM) += -march=nehalem
|
||||
+ cflags-$(CONFIG_MWESTMERE) += -march=westmere
|
||||
+ cflags-$(CONFIG_MSILVERMONT) += -march=silvermont
|
||||
+ cflags-$(CONFIG_MGOLDMONT) += -march=goldmont
|
||||
+ cflags-$(CONFIG_MGOLDMONTPLUS) += -march=goldmont-plus
|
||||
+ cflags-$(CONFIG_MSANDYBRIDGE) += -march=sandybridge
|
||||
+ cflags-$(CONFIG_MIVYBRIDGE) += -march=ivybridge
|
||||
+ cflags-$(CONFIG_MHASWELL) += -march=haswell
|
||||
+ cflags-$(CONFIG_MBROADWELL) += -march=broadwell
|
||||
+ cflags-$(CONFIG_MSKYLAKE) += -march=skylake
|
||||
+ cflags-$(CONFIG_MSKYLAKEX) += -march=skylake-avx512
|
||||
+ cflags-$(CONFIG_MCANNONLAKE) += -march=cannonlake
|
||||
+ cflags-$(CONFIG_MICELAKE) += -march=icelake-client
|
||||
+ cflags-$(CONFIG_MCASCADELAKE) += -march=cascadelake
|
||||
+ cflags-$(CONFIG_MCOOPERLAKE) += -march=cooperlake
|
||||
+ cflags-$(CONFIG_MTIGERLAKE) += -march=tigerlake
|
||||
+ cflags-$(CONFIG_MSAPPHIRERAPIDS) += -march=sapphirerapids
|
||||
+ cflags-$(CONFIG_MROCKETLAKE) += -march=rocketlake
|
||||
+ cflags-$(CONFIG_MALDERLAKE) += -march=alderlake
|
||||
+ cflags-$(CONFIG_MRAPTORLAKE) += -march=raptorlake
|
||||
+ cflags-$(CONFIG_MMETEORLAKE) += -march=meteorlake
|
||||
+ cflags-$(CONFIG_MEMERALDRAPIDS) += -march=emeraldrapids
|
||||
+ cflags-$(CONFIG_GENERIC_CPU2) += -march=x86-64-v2
|
||||
+ cflags-$(CONFIG_GENERIC_CPU3) += -march=x86-64-v3
|
||||
+ cflags-$(CONFIG_GENERIC_CPU4) += -march=x86-64-v4
|
||||
cflags-$(CONFIG_GENERIC_CPU) += -mtune=generic
|
||||
KBUILD_CFLAGS += $(cflags-y)
|
||||
|
||||
diff --git a/arch/x86/include/asm/vermagic.h b/arch/x86/include/asm/vermagic.h
|
||||
index 75884d2cdec3..02c1386eb653 100644
|
||||
--- a/arch/x86/include/asm/vermagic.h
|
||||
+++ b/arch/x86/include/asm/vermagic.h
|
||||
@@ -17,6 +17,54 @@
|
||||
#define MODULE_PROC_FAMILY "586MMX "
|
||||
#elif defined CONFIG_MCORE2
|
||||
#define MODULE_PROC_FAMILY "CORE2 "
|
||||
+#elif defined CONFIG_MNATIVE_INTEL
|
||||
+#define MODULE_PROC_FAMILY "NATIVE_INTEL "
|
||||
+#elif defined CONFIG_MNATIVE_AMD
|
||||
+#define MODULE_PROC_FAMILY "NATIVE_AMD "
|
||||
+#elif defined CONFIG_MNEHALEM
|
||||
+#define MODULE_PROC_FAMILY "NEHALEM "
|
||||
+#elif defined CONFIG_MWESTMERE
|
||||
+#define MODULE_PROC_FAMILY "WESTMERE "
|
||||
+#elif defined CONFIG_MSILVERMONT
|
||||
+#define MODULE_PROC_FAMILY "SILVERMONT "
|
||||
+#elif defined CONFIG_MGOLDMONT
|
||||
+#define MODULE_PROC_FAMILY "GOLDMONT "
|
||||
+#elif defined CONFIG_MGOLDMONTPLUS
|
||||
+#define MODULE_PROC_FAMILY "GOLDMONTPLUS "
|
||||
+#elif defined CONFIG_MSANDYBRIDGE
|
||||
+#define MODULE_PROC_FAMILY "SANDYBRIDGE "
|
||||
+#elif defined CONFIG_MIVYBRIDGE
|
||||
+#define MODULE_PROC_FAMILY "IVYBRIDGE "
|
||||
+#elif defined CONFIG_MHASWELL
|
||||
+#define MODULE_PROC_FAMILY "HASWELL "
|
||||
+#elif defined CONFIG_MBROADWELL
|
||||
+#define MODULE_PROC_FAMILY "BROADWELL "
|
||||
+#elif defined CONFIG_MSKYLAKE
|
||||
+#define MODULE_PROC_FAMILY "SKYLAKE "
|
||||
+#elif defined CONFIG_MSKYLAKEX
|
||||
+#define MODULE_PROC_FAMILY "SKYLAKEX "
|
||||
+#elif defined CONFIG_MCANNONLAKE
|
||||
+#define MODULE_PROC_FAMILY "CANNONLAKE "
|
||||
+#elif defined CONFIG_MICELAKE
|
||||
+#define MODULE_PROC_FAMILY "ICELAKE "
|
||||
+#elif defined CONFIG_MCASCADELAKE
|
||||
+#define MODULE_PROC_FAMILY "CASCADELAKE "
|
||||
+#elif defined CONFIG_MCOOPERLAKE
|
||||
+#define MODULE_PROC_FAMILY "COOPERLAKE "
|
||||
+#elif defined CONFIG_MTIGERLAKE
|
||||
+#define MODULE_PROC_FAMILY "TIGERLAKE "
|
||||
+#elif defined CONFIG_MSAPPHIRERAPIDS
|
||||
+#define MODULE_PROC_FAMILY "SAPPHIRERAPIDS "
|
||||
+#elif defined CONFIG_ROCKETLAKE
|
||||
+#define MODULE_PROC_FAMILY "ROCKETLAKE "
|
||||
+#elif defined CONFIG_MALDERLAKE
|
||||
+#define MODULE_PROC_FAMILY "ALDERLAKE "
|
||||
+#elif defined CONFIG_MRAPTORLAKE
|
||||
+#define MODULE_PROC_FAMILY "RAPTORLAKE "
|
||||
+#elif defined CONFIG_MMETEORLAKE
|
||||
+#define MODULE_PROC_FAMILY "METEORLAKE "
|
||||
+#elif defined CONFIG_MEMERALDRAPIDS
|
||||
+#define MODULE_PROC_FAMILY "EMERALDRAPIDS "
|
||||
#elif defined CONFIG_MATOM
|
||||
#define MODULE_PROC_FAMILY "ATOM "
|
||||
#elif defined CONFIG_M686
|
||||
@@ -35,6 +83,32 @@
|
||||
#define MODULE_PROC_FAMILY "K7 "
|
||||
#elif defined CONFIG_MK8
|
||||
#define MODULE_PROC_FAMILY "K8 "
|
||||
+#elif defined CONFIG_MK8SSE3
|
||||
+#define MODULE_PROC_FAMILY "K8SSE3 "
|
||||
+#elif defined CONFIG_MK10
|
||||
+#define MODULE_PROC_FAMILY "K10 "
|
||||
+#elif defined CONFIG_MBARCELONA
|
||||
+#define MODULE_PROC_FAMILY "BARCELONA "
|
||||
+#elif defined CONFIG_MBOBCAT
|
||||
+#define MODULE_PROC_FAMILY "BOBCAT "
|
||||
+#elif defined CONFIG_MBULLDOZER
|
||||
+#define MODULE_PROC_FAMILY "BULLDOZER "
|
||||
+#elif defined CONFIG_MPILEDRIVER
|
||||
+#define MODULE_PROC_FAMILY "PILEDRIVER "
|
||||
+#elif defined CONFIG_MSTEAMROLLER
|
||||
+#define MODULE_PROC_FAMILY "STEAMROLLER "
|
||||
+#elif defined CONFIG_MJAGUAR
|
||||
+#define MODULE_PROC_FAMILY "JAGUAR "
|
||||
+#elif defined CONFIG_MEXCAVATOR
|
||||
+#define MODULE_PROC_FAMILY "EXCAVATOR "
|
||||
+#elif defined CONFIG_MZEN
|
||||
+#define MODULE_PROC_FAMILY "ZEN "
|
||||
+#elif defined CONFIG_MZEN2
|
||||
+#define MODULE_PROC_FAMILY "ZEN2 "
|
||||
+#elif defined CONFIG_MZEN3
|
||||
+#define MODULE_PROC_FAMILY "ZEN3 "
|
||||
+#elif defined CONFIG_MZEN4
|
||||
+#define MODULE_PROC_FAMILY "ZEN4 "
|
||||
#elif defined CONFIG_MELAN
|
||||
#define MODULE_PROC_FAMILY "ELAN "
|
||||
#elif defined CONFIG_MCRUSOE
|
||||
--
|
||||
2.39.0
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,10 +0,0 @@
|
||||
# load kernel modules that's needed to run accelarated osk SDL
|
||||
force_drivers+=" lima gpu_sched goodix evdev sun6i_mipi_dsi sun8i-drm-hdmi sun8i-mixer panel-sitronix-st7703 "
|
||||
# pmic
|
||||
force_drivers+=" axp20x-pek axp20x_adc "
|
||||
# force feedback
|
||||
force_drivers+=" gpio-vibra "
|
||||
# encryption module
|
||||
force_drivers+=" crc-t10dif "
|
||||
# emmc/sd driver
|
||||
force_drivers+=" sunxi-mmc "
|
||||
@@ -1,9 +0,0 @@
|
||||
# load kernel modules that's needed to run accelarated osk SDL
|
||||
force_drivers+=" panfrost drm gpu_sched evdev rockchipdrm imx258 ov8858 pwm_bl "
|
||||
# pmic
|
||||
force_drivers+=" axp20x-pek axp20x_adc "
|
||||
# force feedback
|
||||
force_drivers+=" gpio-vibra "
|
||||
# encryption module
|
||||
force_drivers+=" crc-t10dif "
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="8"
|
||||
K_NOUSENAME="yes"
|
||||
K_NOSETEXTRAVERSION="yes"
|
||||
K_SECURITY_UNSUPPORTED="1"
|
||||
K_GENPATCHES_VER="1"
|
||||
ETYPE="sources"
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
|
||||
KEYWORDS="~arm64"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
>=sys-devel/patch-2.7.5"
|
||||
|
||||
DESCRIPTION="Full sources for the Linux kernel, with megi's patch for pinephone and gentoo patchset"
|
||||
|
||||
MEGI_TAG="orange-pi-6.4-20230701-2252"
|
||||
SRC_URI="https://github.com/megous/linux/archive/${MEGI_TAG}.tar.gz"
|
||||
|
||||
PATCHES=(
|
||||
#Kernel patch
|
||||
|
||||
#Gentoo Patches
|
||||
${FILESDIR}/1500_XATTR_USER_PREFIX.patch
|
||||
${FILESDIR}/1510_fs-enable-link-security-restrictions-by-default.patch
|
||||
${FILESDIR}/1700_sparc-address-warray-bound-warnings.patch
|
||||
${FILESDIR}/2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
|
||||
${FILESDIR}/2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch
|
||||
${FILESDIR}/2910_bfp-mark-get-entry-ip-as--maybe-unused.patch
|
||||
${FILESDIR}/2920_sign-file-patch-for-libressl.patch
|
||||
${FILESDIR}/3000_Support-printing-firmware-info.patch
|
||||
${FILESDIR}/4567_distro-Gentoo-Kconfig.patch
|
||||
${FILESDIR}/5010_enable-cpu-optimizations-universal.patch
|
||||
|
||||
# Drop Megi's Modem-Power
|
||||
${FILESDIR}/0101-arm64-dts-pinephone-drop-modem-power-node.patch
|
||||
${FILESDIR}/0102-arm64-dts-pinephone-pro-remove-modem-node.patch
|
||||
|
||||
# PinePhonePro
|
||||
${FILESDIR}/0103-arm64-dts-rk3399-pinephone-pro-add-modem-RI-pin.patch
|
||||
|
||||
# Reparent clocks to lower speed-occillator
|
||||
${FILESDIR}/0103-ccu-sun50i-a64-reparent-clocks-to-lower-speed-oscillator.patch
|
||||
# Quirk for Kernel-Bug 210681
|
||||
${FILESDIR}/0104-quirk-kernel-org-bug-210681-firmware_rome_error.patch
|
||||
# LED patches
|
||||
${FILESDIR}/0105-leds-gpio-make-max_brightness-configurable.patch
|
||||
${FILESDIR}/0106-panic-led.patch
|
||||
)
|
||||
|
||||
S="${WORKDIR}/linux-${MEGI_TAG}"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eapply_user
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kernel-2_pkg_postinst
|
||||
einfo "To build and install the kernel use the following commands:"
|
||||
einfo "# make Image modules"
|
||||
einfo "# make DTC_FLAGS="-@" dtbs"
|
||||
einfo "# cp arch/arm64/boot/Image /boot"
|
||||
einfo "# make INSTALL_MOD_PATH=/ modules_install"
|
||||
einfo "# make INSTALL_DTBS_PATH=/boot/dtbs dtbs_install"
|
||||
einfo "You will need to create and initramfs afterwards."
|
||||
einfo "If you use dracut you can run:"
|
||||
einfo "# dracut -m \"rootfs-block base\" --host-only --kver 6.4.1-gentoo-arm64"
|
||||
einfo "Change 6.4.1-gentoo-arm64 to your kernel version installed in /lib/modules"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kernel-2_pkg_postrm
|
||||
}
|
||||
Reference in New Issue
Block a user