Skip to content

Commit 07e1124

Browse files
committed
kernel: bump 6.12 to 6.12.95
Manually rebased: generic/pending-6.12/610-netfilter_match_bypass_default_checks.patch bcm27xx/patches-6.12/950-0501-gpiolib-Override-gpiochip-numbers-with-DT-aliases.patch bcm27xx/patches-6.12/950-0777-drm-v3d-Remove-v3d-cpu_job.patch Removed upstreamed: bcm27xx/patches-6.12/950-0859-drm-v3d-Set-job-pointer-to-NULL-when-the-job-s-fence.patch All other patches automatically rebased.
1 parent 76a764d commit 07e1124

51 files changed

Lines changed: 148 additions & 233 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

include/kernel-6.12

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.12 = .93
2-
LINUX_KERNEL_HASH-6.12.93 = 492648a87c0b69c5ac7f43be64792b9000e3439550d4e82e4a14710c49094fa3
1+
LINUX_VERSION-6.12 = .95
2+
LINUX_KERNEL_HASH-6.12.95 = a9e8c51fcb1e695d1d35dde5886cba579cb6f29c9646c5889f39d63841d4b9f6

target/linux/airoha/patches-6.12/801-01-net-phy-add-PHY_DETACH_NO_HW_RESET-PHY-flag.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
107107
module_phy_driver(as21xxx_drivers);
108108
--- a/drivers/net/phy/phy_device.c
109109
+++ b/drivers/net/phy/phy_device.c
110-
@@ -2069,7 +2069,8 @@ void phy_detach(struct phy_device *phyde
110+
@@ -2072,7 +2072,8 @@ void phy_detach(struct phy_device *phyde
111111
device_release_driver(&phydev->mdio.dev);
112112

113113
/* Assert the reset signal */

target/linux/bcm27xx/patches-6.12/950-0130-drm-v3d-Clock-V3D-down-when-not-in-use.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
7070

7171
--- a/drivers/gpu/drm/v3d/v3d_drv.h
7272
+++ b/drivers/gpu/drm/v3d/v3d_drv.h
73-
@@ -121,6 +121,12 @@ struct v3d_dev {
73+
@@ -124,6 +124,12 @@ struct v3d_dev {
7474
void __iomem *bridge_regs;
7575
void __iomem *gca_regs;
7676
struct clk *clk;
@@ -83,7 +83,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
8383
struct reset_control *reset;
8484

8585
/* Virtual and DMA addresses of the single shared page table. */
86-
@@ -597,3 +603,4 @@ int v3d_perfmon_get_counter_ioctl(struct
86+
@@ -596,3 +602,4 @@ int v3d_perfmon_get_counter_ioctl(struct
8787
/* v3d_sysfs.c */
8888
int v3d_sysfs_init(struct device *dev);
8989
void v3d_sysfs_destroy(struct device *dev);

target/linux/bcm27xx/patches-6.12/950-0153-drm-v3d-Suppress-all-but-the-first-MMU-error.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1313

1414
--- a/drivers/gpu/drm/v3d/v3d_irq.c
1515
+++ b/drivers/gpu/drm/v3d/v3d_irq.c
16-
@@ -197,6 +197,7 @@ v3d_hub_irq(int irq, void *arg)
16+
@@ -183,6 +183,7 @@ v3d_hub_irq(int irq, void *arg)
1717
"GMP",
1818
};
1919
const char *client = "?";
2020
+ static int logged_error;
2121

2222
V3D_WRITE(V3D_MMU_CTL, V3D_READ(V3D_MMU_CTL));
2323

24-
@@ -206,6 +207,7 @@ v3d_hub_irq(int irq, void *arg)
24+
@@ -192,6 +193,7 @@ v3d_hub_irq(int irq, void *arg)
2525
client = v3d41_axi_ids[axi_id];
2626
}
2727

2828
+ if (!logged_error)
2929
dev_err(v3d->drm.dev, "MMU error from client %s (%d) at 0x%llx%s%s%s\n",
3030
client, axi_id, (long long)vio_addr,
3131
((intsts & V3D_HUB_INT_MMU_WRV) ?
32-
@@ -214,6 +216,7 @@ v3d_hub_irq(int irq, void *arg)
32+
@@ -200,6 +202,7 @@ v3d_hub_irq(int irq, void *arg)
3333
", pte invalid" : ""),
3434
((intsts & V3D_HUB_INT_MMU_CAP) ?
3535
", cap exceeded" : ""));

target/linux/bcm27xx/patches-6.12/950-0179-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2626
/* Device and char device-related information */
2727
static DEFINE_IDA(gpio_ida);
2828
static dev_t gpio_devt;
29-
@@ -2813,8 +2815,8 @@ int gpiod_direction_output(struct gpio_d
29+
@@ -2815,8 +2817,8 @@ int gpiod_direction_output(struct gpio_d
3030
value = !!value;
3131

3232
/* GPIOs used for enabled IRQs shall not be set as output */
@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3737
gpiod_err(desc,
3838
"%s: tried to set a GPIO tied to an IRQ as output\n",
3939
__func__);
40-
@@ -3765,8 +3767,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
40+
@@ -3767,8 +3769,8 @@ int gpiochip_lock_as_irq(struct gpio_chi
4141
}
4242

4343
/* To be valid for IRQ the line needs to be input or open drain */

target/linux/bcm27xx/patches-6.12/950-0322-Bluetooth-hci_sync-Add-fallback-bd-address-prop.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2020

2121
--- a/net/bluetooth/hci_sync.c
2222
+++ b/net/bluetooth/hci_sync.c
23-
@@ -4942,6 +4942,7 @@ static const struct {
23+
@@ -4961,6 +4961,7 @@ static const struct {
2424
*/
2525
static int hci_dev_setup_sync(struct hci_dev *hdev)
2626
{
2727
+ struct fwnode_handle *fwnode = dev_fwnode(hdev->dev.parent);
2828
int ret = 0;
2929
bool invalid_bdaddr;
3030
size_t i;
31-
@@ -4970,7 +4971,8 @@ static int hci_dev_setup_sync(struct hci
31+
@@ -4989,7 +4990,8 @@ static int hci_dev_setup_sync(struct hci
3232
test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
3333
if (!ret) {
3434
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&

target/linux/bcm27xx/patches-6.12/950-0344-sdhci-Add-SD-Express-hook.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ sdhci: remove PYA0_INTR_BUG quirk. Add quirks to disable some of the higher SDR
5151
};
5252

5353
/*****************************************************************************\
54-
@@ -4572,6 +4582,15 @@ int sdhci_setup_host(struct sdhci_host *
54+
@@ -4573,6 +4583,15 @@ int sdhci_setup_host(struct sdhci_host *
5555
!(host->quirks2 & SDHCI_QUIRK2_BROKEN_DDR50))
5656
mmc->caps |= MMC_CAP_UHS_DDR50;
5757

target/linux/bcm27xx/patches-6.12/950-0434-drivers-mmc-add-debugfs-entries-for-SD-extension-reg.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
1313

1414
--- a/drivers/mmc/core/mmc.c
1515
+++ b/drivers/mmc/core/mmc.c
16-
@@ -1915,8 +1915,8 @@ static int mmc_init_card(struct mmc_host
16+
@@ -1917,8 +1917,8 @@ static int mmc_init_card(struct mmc_host
1717
host->cqe_enabled = true;
1818

1919
if (card->ext_csd.cmdq_en) {

target/linux/bcm27xx/patches-6.12/950-0437-mmc-sdhci-extend-maximum-ADMA-transfer-length-to-4Mi.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
2323
BUG_ON(data->blksz > host->mmc->max_blk_size);
2424
BUG_ON(data->blocks > 65535);
2525

26-
@@ -4716,11 +4716,16 @@ int sdhci_setup_host(struct sdhci_host *
26+
@@ -4717,11 +4717,16 @@ int sdhci_setup_host(struct sdhci_host *
2727
spin_lock_init(&host->lock);
2828

2929
/*

target/linux/bcm27xx/patches-6.12/950-0440-mmc-restrict-posted-write-counts-for-SD-cards-in-CQ-.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
8585
void mmc_blk_mq_recovery(struct mmc_queue *mq)
8686
--- a/drivers/mmc/core/mmc.c
8787
+++ b/drivers/mmc/core/mmc.c
88-
@@ -1657,6 +1657,7 @@ static int mmc_init_card(struct mmc_host
88+
@@ -1659,6 +1659,7 @@ static int mmc_init_card(struct mmc_host
8989
card->ocr = ocr;
9090
card->type = MMC_TYPE_MMC;
9191
card->rca = 1;
9292
+ card->max_posted_writes = 1;
9393
memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
9494
}
9595

96-
@@ -1922,6 +1923,7 @@ static int mmc_init_card(struct mmc_host
96+
@@ -1924,6 +1925,7 @@ static int mmc_init_card(struct mmc_host
9797
pr_info("%s: Host Software Queue enabled\n",
9898
mmc_hostname(host));
9999
}

0 commit comments

Comments
 (0)