M: Basavaraj Natikar <Basavaraj.Natikar@amd.com>
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
-@@ -682,6 +682,7 @@ config PINCTRL_RP1
+@@ -684,6 +684,7 @@ config PINCTRL_RP1
multi function device.
source "drivers/pinctrl/actions/Kconfig"
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
-@@ -1468,6 +1468,7 @@ static const struct of_device_id pca953x
+@@ -1479,6 +1479,7 @@ static const struct of_device_id pca953x
{ .compatible = "ti,tca9535", .data = OF_953X(16, PCA_INT), },
{ .compatible = "ti,tca9538", .data = OF_953X( 8, PCA_INT), },
{ .compatible = "ti,tca9539", .data = OF_953X(16, PCA_INT), },
--- a/drivers/hwmon/sht3x.c
+++ b/drivers/hwmon/sht3x.c
-@@ -933,13 +933,25 @@ static int sht3x_probe(struct i2c_client
+@@ -934,13 +934,25 @@ static int sht3x_probe(struct i2c_client
static const struct i2c_device_id sht3x_ids[] = {
{"sht3x", sht3x},
{"sts3x", sts3x},
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
-@@ -5015,6 +5015,7 @@ static const struct {
+@@ -5081,6 +5081,7 @@ static const struct {
*/
static int hci_dev_setup_sync(struct hci_dev *hdev)
{
int ret = 0;
bool invalid_bdaddr;
size_t i;
-@@ -5043,7 +5044,8 @@ static int hci_dev_setup_sync(struct hci
+@@ -5109,7 +5110,8 @@ static int hci_dev_setup_sync(struct hci
hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY);
if (!ret) {
if (hci_test_quirk(hdev, HCI_QUIRK_USE_BDADDR_PROPERTY) &&
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
-@@ -1807,7 +1807,7 @@ __drm_fb_helper_initial_config_and_unloc
+@@ -1784,7 +1784,7 @@ __drm_fb_helper_initial_config_and_unloc
struct drm_device *dev = fb_helper->dev;
struct fb_info *info;
unsigned int width, height;
width = dev->mode_config.max_width;
height = dev->mode_config.max_height;
-@@ -1835,6 +1835,15 @@ __drm_fb_helper_initial_config_and_unloc
+@@ -1818,6 +1818,15 @@ __drm_fb_helper_initial_config_and_unloc
* register the fbdev emulation instance in kernel_fb_helper_list. */
mutex_unlock(&fb_helper->lock);
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
-@@ -298,7 +298,7 @@ void brcmf_rx_event(struct device *dev,
+@@ -304,7 +304,7 @@ void brcmf_rx_event(struct device *dev,
int brcmf_alloc(struct device *dev, struct brcmf_mp_device *settings);
/* Indication from bus module regarding presence/insertion of dongle. */
BRCMF_DEFAULT_SCAN_CHANNEL_TIME);
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-@@ -1327,7 +1327,7 @@ int brcmf_alloc(struct device *dev, stru
+@@ -1356,7 +1356,7 @@ int brcmf_alloc(struct device *dev, stru
return 0;
}
{
struct brcmf_bus *bus_if = dev_get_drvdata(dev);
struct brcmf_pub *drvr = bus_if->drvr;
-@@ -1370,10 +1370,12 @@ int brcmf_attach(struct device *dev)
+@@ -1399,10 +1399,12 @@ int brcmf_attach(struct device *dev)
brcmf_fwvid_get_cfg80211_ops(drvr);
/* ready */
return;
-@@ -4652,3 +4863,40 @@ int brcmf_sdio_sleep(struct brcmf_sdio *
+@@ -4658,3 +4869,40 @@ int brcmf_sdio_sleep(struct brcmf_sdio *
return ret;
}
};
/* sdio core registers */
-@@ -367,4 +398,83 @@ void brcmf_sdio_wowl_config(struct devic
+@@ -368,4 +399,83 @@ void brcmf_sdio_wowl_config(struct devic
int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep);
void brcmf_sdio_trigger_dpc(struct brcmf_sdio *bus);
if (ret)
goto error;
-@@ -1288,7 +1288,7 @@ static int brcmf_usb_probe_cb(struct brc
+@@ -1289,7 +1289,7 @@ static int brcmf_usb_probe_cb(struct brc
ret = brcmf_alloc(devinfo->dev, devinfo->settings);
if (ret)
goto fail;
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
-@@ -5015,7 +5015,8 @@ static const struct {
+@@ -5081,7 +5081,8 @@ static const struct {
*/
static int hci_dev_setup_sync(struct hci_dev *hdev)
{
Enable common clock framework support for Raspberry Pi RP1.
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
-@@ -672,7 +672,7 @@ config PINCTRL_MLXBF3
+@@ -674,7 +674,7 @@ config PINCTRL_MLXBF3
config PINCTRL_RP1
tristate "Pinctrl driver for RP1"
base = b;
size = s;
-@@ -416,16 +443,24 @@ static int __init __reserved_mem_alloc_s
+@@ -424,16 +451,24 @@ static int __init __reserved_mem_alloc_s
const __be32 *prop;
bool nomap, default_cma;
int ret;
};
--- a/drivers/net/dsa/mt7530.c
+++ b/drivers/net/dsa/mt7530.c
-@@ -2847,6 +2847,30 @@ static void en7581_mac_port_get_caps(str
+@@ -2829,6 +2829,30 @@ static void en7581_mac_port_get_caps(str
}
}
static void
mt7530_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
phy_interface_t interface)
-@@ -3036,17 +3060,24 @@ static void mt753x_phylink_get_caps(stru
+@@ -3018,17 +3042,24 @@ static void mt753x_phylink_get_caps(stru
struct phylink_config *config)
{
struct mt7530_priv *priv = ds->priv;
priv->info->mac_port_get_caps(ds, port, config);
}
-@@ -3174,7 +3205,8 @@ mt753x_conduit_state_change(struct dsa_s
+@@ -3156,7 +3187,8 @@ mt753x_conduit_state_change(struct dsa_s
* forwarded to the numerically smallest CPU port whose conduit
* interface is up.
*/
return;
mask = BIT(cpu_dp->index);
-@@ -3377,6 +3409,16 @@ const struct mt753x_info mt753x_table[]
+@@ -3359,6 +3391,16 @@ const struct mt753x_info mt753x_table[]
.phy_write_c45 = mt7531_ind_c45_phy_write,
.mac_port_get_caps = en7581_mac_port_get_caps,
},
}
/* If configuration of the interface failed, force the link down
-@@ -4273,6 +4277,57 @@ void phylink_mii_c45_pcs_get_state(struc
+@@ -4274,6 +4278,57 @@ void phylink_mii_c45_pcs_get_state(struc
}
EXPORT_SYMBOL_GPL(phylink_mii_c45_pcs_get_state);
--- a/drivers/net/dsa/mt7530-mdio.c
+++ b/drivers/net/dsa/mt7530-mdio.c
-@@ -113,8 +113,8 @@ mt7531_create_sgmii(struct mt7530_priv *
+@@ -120,8 +120,8 @@ mt7531_create_sgmii(struct mt7530_priv *
ret = PTR_ERR(regmap);
break;
}
# CONFIG_EROFS_FS_ZIP is not set
# CONFIG_EROFS_FS_ZIP_ACCEL is not set
# CONFIG_EROFS_FS_ZIP_DEFLATE is not set
+CONFIG_EROFS_FS_ZIP_LZMA_DEFAULT_MAX_STREAMS=16
# CONFIG_EROFS_FS_ZIP_ZSTD is not set
# CONFIG_ERRATA_MIPS is not set
# CONFIG_ET131X is not set
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -2597,7 +2597,7 @@ int nf_conntrack_init_start(void)
+@@ -2600,7 +2600,7 @@ int nf_conntrack_init_start(void)
if (!nf_conntrack_htable_size) {
nf_conntrack_htable_size
-LINUX_VERSION-6.18 = .43
-LINUX_KERNEL_HASH-6.18.43 = a1aeb926c7c4a1564368200b1082e45bb958007682d804aff88abbc3a7a47b5d
+LINUX_VERSION-6.18 = .44
+LINUX_KERNEL_HASH-6.18.44 = 0f72d938f06828e82c90405174fe572287db7bfe089e2fc46572a99a7f240d43
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
-@@ -8879,7 +8879,7 @@ static int nft_register_flowtable_ops(st
+@@ -8884,7 +8884,7 @@ static int nft_register_flowtable_ops(st
err = flowtable->data.type->setup(&flowtable->data,
ops->dev, FLOW_BLOCK_BIND);
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
-@@ -2282,7 +2282,7 @@ int phylink_fwnode_phy_connect(struct ph
+@@ -2283,7 +2283,7 @@ int phylink_fwnode_phy_connect(struct ph
{
struct fwnode_handle *phy_fwnode;
struct phy_device *phy_dev;
/* Fixed links and 802.3z are handled without needing a PHY */
if (pl->cfg_link_an_mode == MLO_AN_FIXED ||
-@@ -2312,6 +2312,25 @@ int phylink_fwnode_phy_connect(struct ph
+@@ -2313,6 +2313,25 @@ int phylink_fwnode_phy_connect(struct ph
if (pl->config->mac_requires_rxc)
flags |= PHY_F_RXC_ALWAYS_ON;
pl->config = config;
if (config->type == PHYLINK_NETDEV) {
pl->netdev = to_net_dev(config->dev);
-@@ -2015,7 +2023,7 @@ static int phylink_validate_phy(struct p
+@@ -2016,7 +2024,7 @@ static int phylink_validate_phy(struct p
* those which the host supports.
*/
phy_interface_and(interfaces, phy->possible_interfaces,
if (phy_interface_empty(interfaces)) {
phylink_err(pl, "PHY has no common interfaces\n");
-@@ -2757,12 +2765,12 @@ static phy_interface_t phylink_sfp_selec
+@@ -2758,12 +2766,12 @@ static phy_interface_t phylink_sfp_selec
return interface;
}
return PHY_INTERFACE_MODE_NA;
}
-@@ -3690,14 +3698,14 @@ static int phylink_sfp_config_optical(st
+@@ -3691,14 +3699,14 @@ static int phylink_sfp_config_optical(st
phylink_dbg(pl, "optical SFP: interfaces=[mac=%*pbl, sfp=%*pbl]\n",
(int)PHY_INTERFACE_MODE_MAX,
pl->sfp_interfaces);
if (phy_interface_empty(pl->sfp_interfaces)) {
phylink_err(pl, "unsupported SFP module: no common interface modes\n");
-@@ -3868,7 +3876,7 @@ static int phylink_sfp_connect_phy(void
+@@ -3869,7 +3877,7 @@ static int phylink_sfp_connect_phy(void
/* Set the PHY's host supported interfaces */
phy_interface_and(phy->host_interfaces, phylink_sfp_interfaces,
+ */
+ } else if (test_bit(state->interface, pl->config->pcs_interfaces)) {
+ bool pcs_found = false;
-
-- pcs_changed = pl->pcs != pcs;
++
+ list_for_each_entry(pcs, &pl->pcs_list, list) {
+ if (!phylink_validate_pcs_interface(pcs,
+ state->interface)) {
+ break;
+ }
+ }
-+
+
+- pcs_changed = pl->pcs != pcs;
+ if (!pcs_found) {
+ phylink_err(pl,
+ "couldn't find a PCS for %s\n",
pl->config = config;
if (config->type == PHYLINK_NETDEV) {
-@@ -1942,10 +2070,16 @@ EXPORT_SYMBOL_GPL(phylink_create);
+@@ -1943,10 +2071,16 @@ EXPORT_SYMBOL_GPL(phylink_create);
*/
void phylink_destroy(struct phylink *pl)
{
cancel_work_sync(&pl->resolve);
kfree(pl);
}
-@@ -2447,6 +2581,7 @@ static irqreturn_t phylink_link_handler(
+@@ -2448,6 +2582,7 @@ static irqreturn_t phylink_link_handler(
*/
void phylink_start(struct phylink *pl)
{
bool poll = false;
ASSERT_RTNL();
-@@ -2473,6 +2608,10 @@ void phylink_start(struct phylink *pl)
+@@ -2474,6 +2609,10 @@ void phylink_start(struct phylink *pl)
pl->pcs_state = PCS_STATE_STARTED;
phylink_enable_and_run_resolve(pl, PHYLINK_DISABLE_STOPPED);
if (pl->cfg_link_an_mode == MLO_AN_FIXED && pl->link_gpio) {
-@@ -2517,6 +2656,8 @@ EXPORT_SYMBOL_GPL(phylink_start);
+@@ -2518,6 +2657,8 @@ EXPORT_SYMBOL_GPL(phylink_start);
*/
void phylink_stop(struct phylink *pl)
{
ASSERT_RTNL();
if (pl->sfp_bus)
-@@ -2534,6 +2675,14 @@ void phylink_stop(struct phylink *pl)
+@@ -2535,6 +2676,14 @@ void phylink_stop(struct phylink *pl)
pl->pcs_state = PCS_STATE_DOWN;
phylink_pcs_disable(pl->pcs);
#include <net/dst.h>
#include <net/sock.h>
#include <net/checksum.h>
-@@ -5112,6 +5116,9 @@ static const u8 skb_ext_type_len[] = {
+@@ -5118,6 +5122,9 @@ static const u8 skb_ext_type_len[] = {
#if IS_ENABLED(CONFIG_INET_PSP)
[SKB_EXT_PSP] = SKB_EXT_CHUNKSIZEOF(struct psp_skb_ext),
#endif
#include <net/dst.h>
#include <net/sock.h>
#include <net/checksum.h>
-@@ -5112,6 +5116,9 @@ static const u8 skb_ext_type_len[] = {
+@@ -5118,6 +5122,9 @@ static const u8 skb_ext_type_len[] = {
#if IS_ENABLED(CONFIG_INET_PSP)
[SKB_EXT_PSP] = SKB_EXT_CHUNKSIZEOF(struct psp_skb_ext),
#endif
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
-@@ -531,6 +531,17 @@ config PINCTRL_SCMI
+@@ -533,6 +533,17 @@ config PINCTRL_SCMI
It uses SCMI Message Protocol to interact with the
firmware providing all the pinctrl controls.
projects / thirdparty / openwrt.git / commitdiff
