-LINUX_VERSION-6.1 = .56
-LINUX_KERNEL_HASH-6.1.56 = 9edefdde32c2298389dcd19566402332b3c2016f5ada17e5820f500b908d478c
+LINUX_VERSION-6.1 = .57
+LINUX_KERNEL_HASH-6.1.57 = f9ebfe3ddc5152d87b37e33be30e31875d137433be10a57ce29d2eae7b6e91b1
list_for_each_entry(p, head, list) {
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
-@@ -611,48 +611,53 @@ static void tcp_options_write(struct tcp
+@@ -610,48 +610,53 @@ static void tcp_options_write(struct tcp
u16 options = opts->options; /* mungable copy */
if (unlikely(OPTION_MD5 & options)) {
}
if (unlikely(opts->num_sack_blocks)) {
-@@ -660,16 +665,17 @@ static void tcp_options_write(struct tcp
+@@ -659,16 +664,17 @@ static void tcp_options_write(struct tcp
tp->duplicate_sack : tp->selective_acks;
int this_sack;
}
tp->rx_opt.dsack = 0;
-@@ -682,13 +688,14 @@ static void tcp_options_write(struct tcp
+@@ -681,13 +687,14 @@ static void tcp_options_write(struct tcp
if (foc->exp) {
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
-@@ -4165,14 +4165,16 @@ static bool tcp_parse_aligned_timestamp(
+@@ -4178,14 +4178,16 @@ static bool tcp_parse_aligned_timestamp(
{
const __be32 *ptr = (const __be32 *)(th + 1);
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -273,6 +273,27 @@ EXPORT_SYMBOL(init_on_alloc);
+@@ -253,6 +253,27 @@ EXPORT_SYMBOL(init_on_alloc);
DEFINE_STATIC_KEY_MAYBE(CONFIG_INIT_ON_FREE_DEFAULT_ON, init_on_free);
EXPORT_SYMBOL(init_on_free);
static bool _init_on_alloc_enabled_early __read_mostly
= IS_ENABLED(CONFIG_INIT_ON_ALLOC_DEFAULT_ON);
static int __init early_init_on_alloc(char *buf)
-@@ -3093,12 +3114,13 @@ __rmqueue(struct zone *zone, unsigned in
+@@ -3073,12 +3094,13 @@ __rmqueue(struct zone *zone, unsigned in
if (IS_ENABLED(CONFIG_CMA)) {
/*
* Balance movable allocations between regular and CMA areas by
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
-@@ -4635,6 +4635,7 @@ static const struct {
+@@ -4630,6 +4630,7 @@ static const struct {
*/
static int hci_dev_setup_sync(struct hci_dev *hdev)
{
int ret = 0;
bool invalid_bdaddr;
size_t i;
-@@ -4663,7 +4664,9 @@ static int hci_dev_setup_sync(struct hci
+@@ -4658,7 +4659,9 @@ static int hci_dev_setup_sync(struct hci
if (!ret) {
if (test_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks) &&
static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -7957,6 +7957,7 @@ static void __init free_area_init_node(i
+@@ -7943,6 +7943,7 @@ static void __init free_area_init_node(i
pgdat_set_deferred_range(pgdat);
free_area_init_core(pgdat);
#endif
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -1435,8 +1435,7 @@ again:
+@@ -1445,8 +1445,7 @@ again:
force_flush = 1;
set_page_dirty(page);
}
mark_page_accessed(page);
}
rss[mm_counter(page)]--;
-@@ -5189,8 +5188,8 @@ static inline void mm_account_fault(stru
+@@ -5199,8 +5198,8 @@ static inline void mm_account_fault(stru
#ifdef CONFIG_LRU_GEN
static void lru_gen_enter_fault(struct vm_area_struct *vma)
{
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -5942,7 +5942,8 @@ static const struct mv88e6xxx_info mv88e
+@@ -5944,7 +5944,8 @@ static const struct mv88e6xxx_info mv88e
.name = "Marvell 88E6191X",
.num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */
.max_vid = 8191,
.max_sid = 63,
.port_base_addr = 0x0,
-@@ -5965,7 +5966,8 @@ static const struct mv88e6xxx_info mv88e
+@@ -5967,7 +5968,8 @@ static const struct mv88e6xxx_info mv88e
.name = "Marvell 88E6193X",
.num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */
.max_vid = 8191,
.max_sid = 63,
.port_base_addr = 0x0,
-@@ -6284,7 +6286,8 @@ static const struct mv88e6xxx_info mv88e
+@@ -6286,7 +6288,8 @@ static const struct mv88e6xxx_info mv88e
.name = "Marvell 88E6393X",
.num_databases = 4096,
.num_ports = 11, /* 10 + Z80 */
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3326,7 +3326,7 @@ static int mv88e6xxx_setup_port(struct m
+@@ -3328,7 +3328,7 @@ static int mv88e6xxx_setup_port(struct m
caps = pl_config.mac_capabilities;
if (chip->info->ops->port_max_speed_mode)
}
}
-@@ -6229,6 +6235,32 @@ static const struct mv88e6xxx_info mv88e
+@@ -6231,6 +6237,32 @@ static const struct mv88e6xxx_info mv88e
.ptp_support = true,
.ops = &mv88e6352_ops,
},
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3486,6 +3486,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -3488,6 +3488,9 @@ static int mv88e6xxx_setup_port(struct m
else
reg = 1 << port;
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
-@@ -7911,7 +7911,7 @@ static void __init alloc_node_mem_map(st
+@@ -7897,7 +7897,7 @@ static void __init alloc_node_mem_map(st
if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
-@@ -1205,6 +1205,73 @@ static struct mtd_info * __init open_mtd
+@@ -1212,6 +1212,73 @@ static struct mtd_info * __init open_mtd
return mtd;
}
static int __init ubi_init(void)
{
int err, i, k;
-@@ -1289,6 +1356,12 @@ static int __init ubi_init(void)
+@@ -1296,6 +1363,12 @@ static int __init ubi_init(void)
}
}
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -7864,7 +7864,7 @@ static int nft_register_flowtable_net_ho
+@@ -7876,7 +7876,7 @@ static int nft_register_flowtable_net_ho
err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev,
FLOW_BLOCK_BIND);
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -3155,8 +3155,8 @@ static irqreturn_t mtk_handle_irq_rx(int
-
- eth->rx_events++;
- if (likely(napi_schedule_prep(ð->rx_napi))) {
-- __napi_schedule(ð->rx_napi);
- mtk_rx_irq_disable(eth, eth->soc->txrx.rx_irq_done_mask);
-+ __napi_schedule(ð->rx_napi);
- }
-
- return IRQ_HANDLED;
-@@ -3168,8 +3168,8 @@ static irqreturn_t mtk_handle_irq_tx(int
-
- eth->tx_events++;
- if (likely(napi_schedule_prep(ð->tx_napi))) {
-- __napi_schedule(ð->tx_napi);
- mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
-+ __napi_schedule(ð->tx_napi);
- }
-
- return IRQ_HANDLED;
@@ -4941,6 +4941,8 @@ static int mtk_probe(struct platform_dev
* for NAPI to work
*/
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -7023,6 +7023,7 @@ static int mv88e6xxx_register_switch(str
+@@ -7025,6 +7025,7 @@ static int mv88e6xxx_register_switch(str
ds->ops = &mv88e6xxx_switch_ops;
ds->ageing_time_min = chip->info->age_time_coeff;
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
/* clear exclusive status */
if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL &&
-@@ -5328,6 +5344,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5344,6 +5360,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
ata_sff_port_init(ap);
return ap;
-@@ -5363,6 +5382,12 @@ static void ata_host_release(struct kref
+@@ -5379,6 +5398,12 @@ static void ata_host_release(struct kref
kfree(ap->pmp_link);
kfree(ap->slave_link);
kfree(ap);
host->ports[i] = NULL;
}
-@@ -5765,7 +5790,23 @@ int ata_host_register(struct ata_host *h
+@@ -5781,7 +5806,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}
* CONFIG_CMDLINE is meant to be a default in case nothing else
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
-@@ -2221,6 +2221,14 @@ config CMDLINE_FORCE
+@@ -2234,6 +2234,14 @@ config CMDLINE_FORCE
endchoice
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
-@@ -1764,6 +1764,7 @@ static const struct of_device_id qcom_pc
+@@ -1762,6 +1762,7 @@ static const struct of_device_id qcom_pc
{ .compatible = "qcom,pcie-ipq8064", .data = &cfg_2_1_0 },
{ .compatible = "qcom,pcie-ipq8064-v2", .data = &cfg_2_1_0 },
{ .compatible = "qcom,pcie-ipq8074", .data = &cfg_2_3_3 },
+++ /dev/null
-From f92c2f22197b7beed59b81f2aa179e16987c02e4 Mon Sep 17 00:00:00 2001
-From: Sricharan Ramabadhran <quic_srichara@quicinc.com>
-Date: Mon, 24 Jul 2023 12:04:29 +0530
-Subject: [PATCH] PCI: qcom: Fixing broken pcie enumeration for 2_3_3 configs
- ops
-
-PARF_SLV_ADDR_SPACE_SIZE_2_3_3 macro is used for IPQ8074 2_3_3 post_init.
-PCIe slave addr register offset is 0x358, but was wrongly changed to
-0x168 as a part of commit 39171b33f652 ("PCI: qcom: Remove PCIE20_ prefix
-from register definitions"). Fixing it, by using the right macro and remove
-the unused PARF_SLV_ADDR_SPACE_SIZE_2_3_3.
-
-Without this access to the registers of slave addr space like iATU etc
-are broken leading to pcie enumeration failure.
-
-Fixes: 39171b33f652 ("PCI: qcom: Remove PCIE20_ prefix from register definitions")
-Cc: <Stable@vger.kernel.org>
-Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Sricharan Ramabadhran <quic_srichara@quicinc.com>
----
- drivers/pci/controller/dwc/pcie-qcom.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/drivers/pci/controller/dwc/pcie-qcom.c
-+++ b/drivers/pci/controller/dwc/pcie-qcom.c
-@@ -40,7 +40,6 @@
- #define PARF_PHY_REFCLK 0x4c
- #define PARF_CONFIG_BITS 0x50
- #define PARF_DBI_BASE_ADDR 0x168
--#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3 0x16c /* Register offset specific to IP ver 2.3.3 */
- #define PARF_MHI_CLOCK_RESET_CTRL 0x174
- #define PARF_AXI_MSTR_WR_ADDR_HALT 0x178
- #define PARF_AXI_MSTR_WR_ADDR_HALT_V2 0x1a8
-@@ -1148,8 +1147,7 @@ static int qcom_pcie_post_init_2_3_3(str
- u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
- u32 val;
-
-- writel(SLV_ADDR_SPACE_SZ,
-- pcie->parf + PARF_SLV_ADDR_SPACE_SIZE_2_3_3);
-+ writel(SLV_ADDR_SPACE_SZ, pcie->parf + PARF_SLV_ADDR_SPACE_SIZE);
-
- val = readl(pcie->parf + PARF_PHY_CTRL);
- val &= ~BIT(0);
projects / openwrt / staging / dangole.git / commitdiff