Skip to content

Commit bbf045a

Browse files
saiarcot895yxieca
authored andcommitted
Update kernel to 6.1.38
Patches that either required no changes or minimal changes for compilation are enabled. Other patches that appeared to require more changes or changes involving domain knowledge have been disabled for now. Dependent patches/configs have been disabled as well. Signed-off-by: Saikrishna Arcot <[email protected]>
1 parent c79efd7 commit bbf045a

16 files changed

+273
-516
lines changed

Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ SHELL = /bin/bash
33
.SHELLFLAGS += -e
44

55
KERNEL_ABI_MINOR_VERSION = 2
6-
KVERSION_SHORT ?= 5.10.0-23-$(KERNEL_ABI_MINOR_VERSION)
6+
KVERSION_SHORT ?= 6.1.0-11-$(KERNEL_ABI_MINOR_VERSION)
77
KVERSION ?= $(KVERSION_SHORT)-amd64
8-
KERNEL_VERSION ?= 5.10.179
9-
KERNEL_SUBVERSION ?= 3
8+
KERNEL_VERSION ?= 6.1.38
9+
KERNEL_SUBVERSION ?= 4
1010
kernel_procure_method ?= build
1111
CONFIGURED_ARCH ?= amd64
1212
CONFIGURED_PLATFORM ?= vs
@@ -109,9 +109,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
109109
debian/bin/gencontrol.py
110110

111111
# generate linux build file for amd64_none_amd64
112-
fakeroot make -f debian/rules.gen DEB_HOST_ARCH=armhf setup_armhf_none_armmp
113-
fakeroot make -f debian/rules.gen DEB_HOST_ARCH=arm64 setup_arm64_none_arm64
114-
fakeroot make -f debian/rules.gen DEB_HOST_ARCH=amd64 setup_amd64_none_amd64
112+
DEB_HOST_ARCH=armhf fakeroot make -f debian/rules.gen setup_armhf_none_armmp
113+
DEB_HOST_ARCH=arm64 fakeroot make -f debian/rules.gen setup_arm64_none_arm64
114+
DEB_HOST_ARCH=amd64 fakeroot make -f debian/rules.gen setup_amd64_none_amd64
115115

116116
# Applying patches and configuration changes
117117
git add debian/build/build_armhf_none_armmp/.config -f

patch/0001-psample-Encapsulate-packet-metadata-in-a-struct.patch

-145
This file was deleted.

patch/0002-psample-Add-additional-metadata-attributes.patch

-132
This file was deleted.

patch/cisco-acpi-spi-nor.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ index 2b26a875a..82bbd84a2 100644
4444
* REVISIT: many of these chips have deep power-down modes, which
4545
* should clearly be entered on suspend() to minimize power use.
4646
@@ -3490,6 +3500,7 @@ static struct spi_mem_driver spi_nor_driver = {
47-
.driver = {
4847
.name = "spi-nor",
4948
.of_match_table = spi_nor_of_table,
49+
.dev_groups = spi_nor_sysfs_groups,
5050
+ .acpi_match_table = ACPI_PTR(spi_nor_acpi_table),
5151
},
5252
.id_table = spi_nor_dev_ids,

patch/cisco-npu-disable-other-bars.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ index 16fb3d771..0efe3f62a 100644
2424
--- a/drivers/pci/quirks.c
2525
+++ b/drivers/pci/quirks.c
2626
@@ -5762,3 +5762,48 @@ static void apex_pci_fixup_class(struct pci_dev *pdev)
27-
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
28-
}
29-
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
27+
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size);
28+
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size);
29+
#endif
3030
+
3131
+#define PCI_DEVICE_ID_LEABA_PACIFIC 0xabcd
3232
+#define PCI_DEVICE_ID_LEABA_GIBRALTAR 0xa001

patch/driver-arista-net-tg3-disallow-broadcom-default-mac.patch

+18-18
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@ index 72198ef56..997de31f9 100644
2929
{
3030
struct tg3 *tp = netdev_priv(dev);
3131
@@ -17040,28 +17049,18 @@ static int tg3_get_device_address(struct tg3 *tp)
32-
dev->dev_addr[5] = (lo >> 0) & 0xff;
32+
addr[5] = (lo >> 0) & 0xff;
3333

3434
/* Some old bootcode may report a 0 MAC address in SRAM */
35-
- addr_ok = is_valid_ether_addr(&dev->dev_addr[0]);
36-
+ addr_ok = is_valid_bcm_ether_addr(&dev->dev_addr[0]);
35+
- addr_ok = is_valid_ether_addr(addr);
36+
+ addr_ok = is_valid_bcm_ether_addr(addr);
3737
}
3838
if (!addr_ok) {
3939
- /* Next, try NVRAM. */
4040
- if (!tg3_flag(tp, NO_NVRAM) &&
4141
- !tg3_nvram_read_be32(tp, mac_offset + 0, &hi) &&
4242
- !tg3_nvram_read_be32(tp, mac_offset + 4, &lo)) {
43-
- memcpy(&dev->dev_addr[0], ((char *)&hi) + 2, 2);
44-
- memcpy(&dev->dev_addr[2], (char *)&lo, sizeof(lo));
43+
- memcpy(&addr[0], ((char *)&hi) + 2, 2);
44+
- memcpy(&addr[2], (char *)&lo, sizeof(lo));
4545
- }
4646
- /* Finally just fetch it out of the MAC control regs. */
4747
- else {
@@ -50,19 +50,19 @@ index 72198ef56..997de31f9 100644
5050
+ hi = tr32(MAC_ADDR_0_HIGH);
5151
+ lo = tr32(MAC_ADDR_0_LOW);
5252

53-
- dev->dev_addr[5] = lo & 0xff;
54-
- dev->dev_addr[4] = (lo >> 8) & 0xff;
55-
- dev->dev_addr[3] = (lo >> 16) & 0xff;
56-
- dev->dev_addr[2] = (lo >> 24) & 0xff;
57-
- dev->dev_addr[1] = hi & 0xff;
58-
- dev->dev_addr[0] = (hi >> 8) & 0xff;
53+
- addr[5] = lo & 0xff;
54+
- addr[4] = (lo >> 8) & 0xff;
55+
- addr[3] = (lo >> 16) & 0xff;
56+
- addr[2] = (lo >> 24) & 0xff;
57+
- addr[1] = hi & 0xff;
58+
- addr[0] = (hi >> 8) & 0xff;
5959
- }
60-
+ dev->dev_addr[5] = lo & 0xff;
61-
+ dev->dev_addr[4] = (lo >> 8) & 0xff;
62-
+ dev->dev_addr[3] = (lo >> 16) & 0xff;
63-
+ dev->dev_addr[2] = (lo >> 24) & 0xff;
64-
+ dev->dev_addr[1] = hi & 0xff;
65-
+ dev->dev_addr[0] = (hi >> 8) & 0xff;
60+
+ addr[5] = lo & 0xff;
61+
+ addr[4] = (lo >> 8) & 0xff;
62+
+ addr[3] = (lo >> 16) & 0xff;
63+
+ addr[2] = (lo >> 24) & 0xff;
64+
+ addr[1] = hi & 0xff;
65+
+ addr[0] = (hi >> 8) & 0xff;
6666
}
6767

68-
if (!is_valid_ether_addr(&dev->dev_addr[0]))
68+
if (!is_valid_ether_addr(addr))

0 commit comments

Comments
 (0)