Skip to content

Commit

Permalink
Update kernel to 6.1.38
Browse files Browse the repository at this point in the history
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 <sarcot@microsoft.com>
  • Loading branch information
saiarcot895 authored and yxieca committed Nov 20, 2023
1 parent c79efd7 commit bbf045a
Show file tree
Hide file tree
Showing 16 changed files with 273 additions and 516 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ SHELL = /bin/bash
.SHELLFLAGS += -e

KERNEL_ABI_MINOR_VERSION = 2
KVERSION_SHORT ?= 5.10.0-23-$(KERNEL_ABI_MINOR_VERSION)
KVERSION_SHORT ?= 6.1.0-11-$(KERNEL_ABI_MINOR_VERSION)
KVERSION ?= $(KVERSION_SHORT)-amd64
KERNEL_VERSION ?= 5.10.179
KERNEL_SUBVERSION ?= 3
KERNEL_VERSION ?= 6.1.38
KERNEL_SUBVERSION ?= 4
kernel_procure_method ?= build
CONFIGURED_ARCH ?= amd64
CONFIGURED_PLATFORM ?= vs
Expand Down Expand Up @@ -109,9 +109,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
debian/bin/gencontrol.py

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

# Applying patches and configuration changes
git add debian/build/build_armhf_none_armmp/.config -f
Expand Down
145 changes: 0 additions & 145 deletions patch/0001-psample-Encapsulate-packet-metadata-in-a-struct.patch

This file was deleted.

132 changes: 0 additions & 132 deletions patch/0002-psample-Add-additional-metadata-attributes.patch

This file was deleted.

2 changes: 1 addition & 1 deletion patch/cisco-acpi-spi-nor.patch
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ index 2b26a875a..82bbd84a2 100644
* REVISIT: many of these chips have deep power-down modes, which
* should clearly be entered on suspend() to minimize power use.
@@ -3490,6 +3500,7 @@ static struct spi_mem_driver spi_nor_driver = {
.driver = {
.name = "spi-nor",
.of_match_table = spi_nor_of_table,
.dev_groups = spi_nor_sysfs_groups,
+ .acpi_match_table = ACPI_PTR(spi_nor_acpi_table),
},
.id_table = spi_nor_dev_ids,
Expand Down
6 changes: 3 additions & 3 deletions patch/cisco-npu-disable-other-bars.patch
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ index 16fb3d771..0efe3f62a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -5762,3 +5762,48 @@ static void apex_pci_fixup_class(struct pci_dev *pdev)
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
}
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size);
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size);
#endif
+
+#define PCI_DEVICE_ID_LEABA_PACIFIC 0xabcd
+#define PCI_DEVICE_ID_LEABA_GIBRALTAR 0xa001
Expand Down
36 changes: 18 additions & 18 deletions patch/driver-arista-net-tg3-disallow-broadcom-default-mac.patch
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ index 72198ef56..997de31f9 100644
{
struct tg3 *tp = netdev_priv(dev);
@@ -17040,28 +17049,18 @@ static int tg3_get_device_address(struct tg3 *tp)
dev->dev_addr[5] = (lo >> 0) & 0xff;
addr[5] = (lo >> 0) & 0xff;

/* Some old bootcode may report a 0 MAC address in SRAM */
- addr_ok = is_valid_ether_addr(&dev->dev_addr[0]);
+ addr_ok = is_valid_bcm_ether_addr(&dev->dev_addr[0]);
- addr_ok = is_valid_ether_addr(addr);
+ addr_ok = is_valid_bcm_ether_addr(addr);
}
if (!addr_ok) {
- /* Next, try NVRAM. */
- if (!tg3_flag(tp, NO_NVRAM) &&
- !tg3_nvram_read_be32(tp, mac_offset + 0, &hi) &&
- !tg3_nvram_read_be32(tp, mac_offset + 4, &lo)) {
- memcpy(&dev->dev_addr[0], ((char *)&hi) + 2, 2);
- memcpy(&dev->dev_addr[2], (char *)&lo, sizeof(lo));
- memcpy(&addr[0], ((char *)&hi) + 2, 2);
- memcpy(&addr[2], (char *)&lo, sizeof(lo));
- }
- /* Finally just fetch it out of the MAC control regs. */
- else {
Expand All @@ -50,19 +50,19 @@ index 72198ef56..997de31f9 100644
+ hi = tr32(MAC_ADDR_0_HIGH);
+ lo = tr32(MAC_ADDR_0_LOW);

- dev->dev_addr[5] = lo & 0xff;
- dev->dev_addr[4] = (lo >> 8) & 0xff;
- dev->dev_addr[3] = (lo >> 16) & 0xff;
- dev->dev_addr[2] = (lo >> 24) & 0xff;
- dev->dev_addr[1] = hi & 0xff;
- dev->dev_addr[0] = (hi >> 8) & 0xff;
- addr[5] = lo & 0xff;
- addr[4] = (lo >> 8) & 0xff;
- addr[3] = (lo >> 16) & 0xff;
- addr[2] = (lo >> 24) & 0xff;
- addr[1] = hi & 0xff;
- addr[0] = (hi >> 8) & 0xff;
- }
+ dev->dev_addr[5] = lo & 0xff;
+ dev->dev_addr[4] = (lo >> 8) & 0xff;
+ dev->dev_addr[3] = (lo >> 16) & 0xff;
+ dev->dev_addr[2] = (lo >> 24) & 0xff;
+ dev->dev_addr[1] = hi & 0xff;
+ dev->dev_addr[0] = (hi >> 8) & 0xff;
+ addr[5] = lo & 0xff;
+ addr[4] = (lo >> 8) & 0xff;
+ addr[3] = (lo >> 16) & 0xff;
+ addr[2] = (lo >> 24) & 0xff;
+ addr[1] = hi & 0xff;
+ addr[0] = (hi >> 8) & 0xff;
}

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

0 comments on commit bbf045a

Please sign in to comment.