diff --git a/modules/linux b/modules/linux index 464130f9..5cfa3072 100644 --- a/modules/linux +++ b/modules/linux @@ -34,12 +34,9 @@ linux_hash := 40f014d53e81f204f6d2a364aae4201ae07970dd1b70dc602d7c66c1a140f558 else ifeq "$(CONFIG_LINUX_VERSION)" "6.1.8" linux_version := 6.1.8 linux_hash := b60bb53ab8ba370a270454b11e93d41af29126fc72bd6ede517673e2e57b816d -else ifeq "$(CONFIG_LINUX_VERSION)" "6.11.9" -linux_version := 6.11.9 -linux_hash := 75658a7aa3bd9598c96ee1e5862c5e1d34fced75c28d825c727a1510a6f384b4 else $(error "$(BOARD): does not specify linux kernel version under CONFIG_LINUX_VERSION") -endif +endif linux_base_dir := linux-$(linux_version) @@ -222,7 +219,7 @@ $(build)/$(BOARD)/$(LINUX_IMAGE_FILE).bundled: \ # modify_and_save_defconfig_in_place target allows us edit current in tree config # under linux decompressed+patched directory through menuconfig -# and put it back in git tree to check changes with git difftool iteratively +# and put it back in git tree to check changes with git difftool iteratively linux.modify_and_save_defconfig_in_place: cp "$(pwd)/$(linux_kconfig)" "$(build)/$(linux_dir)/.config" && \ $(MAKE) \ @@ -307,7 +304,7 @@ linux.save_in_versioned_oldconfig: # Then bump board config's CONFIG_LINUX_VERSION. build as usual to extract new linux tarball. # Then call make BOARD=xyz linux.prompt_for_new_config_options_for_kernel_version_bump #The following ask new config choice for all new symbols that should be evaluated prior of creating PR -# Tip: Open a browser at https://www.kernelconfig.io/index.html +# Tip: Open a browser at https://www.kernelconfig.io/index.html linux.prompt_for_new_config_options_for_kernel_version_bump: mkdir -p "$(build)/$(linux_dir)" \ && cp "$(pwd)/$(linux_kconfig)" "$(build)/$(linux_dir)/.config" \ diff --git a/patches/linux-6.11.9/0001-fake-acpi.patch b/patches/linux-6.11.9/0001-fake-acpi.patch deleted file mode 100644 index 0c8b3b54..00000000 --- a/patches/linux-6.11.9/0001-fake-acpi.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --recursive -u ./clean/linux-4.9.80/drivers/acpi/acpica/evxfevnt.c linux-4.9.80/drivers/acpi/acpica/evxfevnt.c ---- ./clean/linux-4.9.80/drivers/acpi/acpica/evxfevnt.c 2018-02-03 11:05:43.000000000 -0500 -+++ linux-4.9.80/drivers/acpi/acpica/evxfevnt.c 2018-02-07 15:51:28.786502597 -0500 -@@ -111,6 +111,8 @@ - } - - ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode")); -+printk("%s:%d faking ACPI mode\n", __func__, __LINE__); -+ return_ACPI_STATUS(AE_OK); - return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE); - } - -diff --recursive -u ./clean/linux-4.9.80/drivers/acpi/acpica/hwacpi.c linux-4.9.80/drivers/acpi/acpica/hwacpi.c ---- ./clean/linux-4.9.80/drivers/acpi/acpica/hwacpi.c 2018-02-03 11:05:43.000000000 -0500 -+++ linux-4.9.80/drivers/acpi/acpica/hwacpi.c 2018-02-07 15:51:35.126557868 -0500 -@@ -168,12 +168,16 @@ - - status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value); - if (ACPI_FAILURE(status)) { -+printk("%s:%d faking ACPI mode\n", __func__, __LINE__); -+ return_UINT32(ACPI_SYS_MODE_ACPI); - return_UINT32(ACPI_SYS_MODE_LEGACY); - } - - if (value) { - return_UINT32(ACPI_SYS_MODE_ACPI); - } else { -+//printk("%s:%d faking ACPI mode\n", __func__, __LINE__); -+// return_UINT32(ACPI_SYS_MODE_ACPI); - return_UINT32(ACPI_SYS_MODE_LEGACY); - } - } diff --git a/patches/linux-6.11.9/0010-winterfell-ahci.patch b/patches/linux-6.11.9/0010-winterfell-ahci.patch deleted file mode 100644 index 7f241773..00000000 --- a/patches/linux-6.11.9/0010-winterfell-ahci.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --recursive -u ./clean/linux-4.9.80/drivers/ata/libahci.c linux-4.9.80/drivers/ata/libahci.c ---- ./clean/linux-4.9.80/drivers/ata/libahci.c 2018-02-03 11:05:43.000000000 -0500 -+++ linux-4.9.80/drivers/ata/libahci.c 2018-02-07 18:02:32.526535910 -0500 -@@ -537,8 +537,12 @@ - } - - /* fabricate port_map from cap.nr_ports for < AHCI 1.3 */ -- if (!port_map && vers < 0x10300) { -- port_map = (1 << ahci_nr_ports(cap)) - 1; -+ if (!port_map) { // && vers < 0x10300) { -+ printk("%s: saved_port=%02x\n", __func__, hpriv->saved_port_map); -+ writel(0x1, mmio + HOST_PORTS_IMPL); -+ port_map = readl(mmio + HOST_PORTS_IMPL); -+ -+ //port_map = (1 << ahci_nr_ports(cap)) - 1; - dev_warn(dev, "forcing PORTS_IMPL to 0x%lx\n", port_map); - - /* write the fixed up value to the PI register */