diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-30 06:39:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-08-30 06:39:40 -0700 |
| commit | 4c1066d8a8011ff4353f756852a8da294dee9f9b (patch) | |
| tree | 3ad44ba557400cca695f9e2b02e9188f07807923 | |
| parent | 238ce9c4b5c03fb388e072500defaf256884dd05 (diff) | |
| download | ltsi-kernel-4c1066d8a8011ff4353f756852a8da294dee9f9b.tar.gz | |
update KERNEL_VERSION to 4.9.124
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
90 files changed, 259 insertions, 445 deletions
diff --git a/KERNEL_VERSION b/KERNEL_VERSION index b50d2e94807066..dce8f41796eb39 100644 --- a/KERNEL_VERSION +++ b/KERNEL_VERSION @@ -1 +1 @@ -4.9.76 +4.9.124 diff --git a/patches.renesas/0009-arm64-defconfig-Enable-DRM-DU-and-V4L2-FCP-VSP-modul.patch b/patches.renesas/0009-arm64-defconfig-Enable-DRM-DU-and-V4L2-FCP-VSP-modul.patch index 31c4aa64a027d8..d980fbed595636 100644 --- a/patches.renesas/0009-arm64-defconfig-Enable-DRM-DU-and-V4L2-FCP-VSP-modul.patch +++ b/patches.renesas/0009-arm64-defconfig-Enable-DRM-DU-and-V4L2-FCP-VSP-modul.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -292,8 +292,22 @@ CONFIG_REGULATOR_PWM=y +@@ -294,8 +294,22 @@ CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_QCOM_SMD_RPM=y CONFIG_REGULATOR_QCOM_SPMI=y CONFIG_REGULATOR_S2MPS11=y diff --git a/patches.renesas/0013-clk-renesas-cpg-mssr-Migrate-to-CLK_IS_CRITICAL.patch b/patches.renesas/0013-clk-renesas-cpg-mssr-Migrate-to-CLK_IS_CRITICAL.patch index 12c5fcaf960fe7..51e6fc43eb00bc 100644 --- a/patches.renesas/0013-clk-renesas-cpg-mssr-Migrate-to-CLK_IS_CRITICAL.patch +++ b/patches.renesas/0013-clk-renesas-cpg-mssr-Migrate-to-CLK_IS_CRITICAL.patch @@ -26,7 +26,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c -@@ -346,17 +346,10 @@ static void __init cpg_mssr_register_mod +@@ -347,17 +347,10 @@ static void __init cpg_mssr_register_mod init.flags = CLK_IS_BASIC | CLK_SET_RATE_PARENT; for (i = 0; i < info->num_crit_mod_clks; i++) if (id == info->crit_mod_clks[i]) { diff --git a/patches.renesas/0014-ARM64-defconfig-enable-the-leds-pwm-driver-and-defau.patch b/patches.renesas/0014-ARM64-defconfig-enable-the-leds-pwm-driver-and-defau.patch index 0c7be8c19941f3..6b9d7702a0fe4d 100644 --- a/patches.renesas/0014-ARM64-defconfig-enable-the-leds-pwm-driver-and-defau.patch +++ b/patches.renesas/0014-ARM64-defconfig-enable-the-leds-pwm-driver-and-defau.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -370,8 +370,10 @@ CONFIG_MMC_SUNXI=y +@@ -372,8 +372,10 @@ CONFIG_MMC_SUNXI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y diff --git a/patches.renesas/0019-clk-renesas-cpg-mssr-Rename-cpg_mssr_priv.mstp_lock.patch b/patches.renesas/0019-clk-renesas-cpg-mssr-Rename-cpg_mssr_priv.mstp_lock.patch index 145a09bb010ec9..c6949a765c0cd2 100644 --- a/patches.renesas/0019-clk-renesas-cpg-mssr-Rename-cpg_mssr_priv.mstp_lock.patch +++ b/patches.renesas/0019-clk-renesas-cpg-mssr-Rename-cpg_mssr_priv.mstp_lock.patch @@ -53,7 +53,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!enable) return 0; -@@ -550,7 +550,7 @@ static int __init cpg_mssr_probe(struct +@@ -551,7 +551,7 @@ static int __init cpg_mssr_probe(struct return -ENOMEM; priv->dev = dev; diff --git a/patches.renesas/0019-i2c-rcar-Add-per-Generation-fallback-bindings.patch b/patches.renesas/0019-i2c-rcar-Add-per-Generation-fallback-bindings.patch index df8d798b344519..d9387e542ebd00 100644 --- a/patches.renesas/0019-i2c-rcar-Add-per-Generation-fallback-bindings.patch +++ b/patches.renesas/0019-i2c-rcar-Add-per-Generation-fallback-bindings.patch @@ -82,7 +82,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> clocks = <&mstp9_clks R8A7791_CLK_I2C0>; --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c -@@ -793,7 +793,6 @@ static const struct i2c_algorithm rcar_i +@@ -795,7 +795,6 @@ static const struct i2c_algorithm rcar_i }; static const struct of_device_id rcar_i2c_dt_ids[] = { @@ -90,7 +90,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { .compatible = "renesas,i2c-r8a7778", .data = (void *)I2C_RCAR_GEN1 }, { .compatible = "renesas,i2c-r8a7779", .data = (void *)I2C_RCAR_GEN1 }, { .compatible = "renesas,i2c-r8a7790", .data = (void *)I2C_RCAR_GEN2 }, -@@ -803,6 +802,10 @@ static const struct of_device_id rcar_i2 +@@ -805,6 +804,10 @@ static const struct of_device_id rcar_i2 { .compatible = "renesas,i2c-r8a7794", .data = (void *)I2C_RCAR_GEN2 }, { .compatible = "renesas,i2c-r8a7795", .data = (void *)I2C_RCAR_GEN3 }, { .compatible = "renesas,i2c-r8a7796", .data = (void *)I2C_RCAR_GEN3 }, diff --git a/patches.renesas/0020-clk-renesas-cpg-mssr-Add-support-for-reset-control.patch b/patches.renesas/0020-clk-renesas-cpg-mssr-Add-support-for-reset-control.patch index 46618cf71aa95e..3f4418d0074215 100644 --- a/patches.renesas/0020-clk-renesas-cpg-mssr-Add-support-for-reset-control.patch +++ b/patches.renesas/0020-clk-renesas-cpg-mssr-Add-support-for-reset-control.patch @@ -58,7 +58,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct device *dev; void __iomem *base; spinlock_t rmw_lock; -@@ -494,6 +500,122 @@ static int __init cpg_mssr_add_clk_domai +@@ -495,6 +501,122 @@ static int __init cpg_mssr_add_clk_domai return 0; } @@ -181,7 +181,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static const struct of_device_id cpg_mssr_match[] = { #ifdef CONFIG_ARCH_R8A7743 { -@@ -591,6 +713,10 @@ static int __init cpg_mssr_probe(struct +@@ -592,6 +714,10 @@ static int __init cpg_mssr_probe(struct if (error) return error; diff --git a/patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch b/patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch index c331607cb59708..cd44c6388b4fe1 100644 --- a/patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch +++ b/patches.renesas/0034-net-phy-phy-drivers-should-not-set-SUPPORTED_-Asym_-.patch @@ -328,7 +328,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ks8737_type, .config_init = kszphy_config_init, -@@ -810,8 +810,7 @@ static struct phy_driver ksphy_driver[] +@@ -807,8 +807,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8021, .phy_id_mask = 0x00ffffff, .name = "Micrel KSZ8021 or KSZ8031", @@ -338,7 +338,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8021_type, .probe = kszphy_probe, -@@ -829,8 +828,7 @@ static struct phy_driver ksphy_driver[] +@@ -826,8 +825,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8031, .phy_id_mask = 0x00ffffff, .name = "Micrel KSZ8031", @@ -348,7 +348,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8021_type, .probe = kszphy_probe, -@@ -848,8 +846,7 @@ static struct phy_driver ksphy_driver[] +@@ -845,8 +843,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8041, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8041", @@ -358,7 +358,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8041_type, .probe = kszphy_probe, -@@ -867,8 +864,7 @@ static struct phy_driver ksphy_driver[] +@@ -864,8 +861,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8041RNLI, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8041RNLI", @@ -368,7 +368,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8041_type, .probe = kszphy_probe, -@@ -886,8 +882,7 @@ static struct phy_driver ksphy_driver[] +@@ -883,8 +879,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8051, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8051", @@ -378,7 +378,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8051_type, .probe = kszphy_probe, -@@ -905,7 +900,7 @@ static struct phy_driver ksphy_driver[] +@@ -902,7 +897,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8001, .name = "Micrel KSZ8001 or KS8721", .phy_id_mask = 0x00fffffc, @@ -387,7 +387,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8041_type, .probe = kszphy_probe, -@@ -923,7 +918,7 @@ static struct phy_driver ksphy_driver[] +@@ -920,7 +915,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8081, .name = "Micrel KSZ8081 or KSZ8091", .phy_id_mask = MICREL_PHY_ID_MASK, @@ -396,7 +396,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz8081_type, .probe = kszphy_probe, -@@ -941,7 +936,7 @@ static struct phy_driver ksphy_driver[] +@@ -938,7 +933,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8061, .name = "Micrel KSZ8061", .phy_id_mask = MICREL_PHY_ID_MASK, @@ -405,7 +405,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .config_init = kszphy_config_init, .config_aneg = genphy_config_aneg, -@@ -957,7 +952,7 @@ static struct phy_driver ksphy_driver[] +@@ -951,7 +946,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ9021, .phy_id_mask = 0x000ffffe, .name = "Micrel KSZ9021 Gigabit PHY", @@ -413,8 +413,8 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> + .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz9021_type, - .config_init = ksz9021_config_init, -@@ -976,7 +971,7 @@ static struct phy_driver ksphy_driver[] + .probe = kszphy_probe, +@@ -971,7 +966,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ9031, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ9031 Gigabit PHY", @@ -422,8 +422,8 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> + .features = PHY_GBIT_FEATURES, .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .driver_data = &ksz9021_type, - .config_init = ksz9031_config_init, -@@ -993,7 +988,6 @@ static struct phy_driver ksphy_driver[] + .probe = kszphy_probe, +@@ -989,7 +984,6 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ8873MLL, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ8873MLL Switch", @@ -431,7 +431,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .flags = PHY_HAS_MAGICANEG, .config_init = kszphy_config_init, .config_aneg = ksz8873mll_config_aneg, -@@ -1007,7 +1001,7 @@ static struct phy_driver ksphy_driver[] +@@ -1000,7 +994,7 @@ static struct phy_driver ksphy_driver[] .phy_id = PHY_ID_KSZ886X, .phy_id_mask = MICREL_PHY_ID_MASK, .name = "Micrel KSZ886X Switch", @@ -465,7 +465,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> .config_aneg = genphy_config_aneg, --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1699,6 +1699,25 @@ static int phy_probe(struct device *dev) +@@ -1696,6 +1696,25 @@ static int phy_probe(struct device *dev) */ of_set_phy_eee_broken(phydev); diff --git a/patches.renesas/0039-arm64-set-CONFIG_MMC_BCM2835-y-in-defconfig.patch b/patches.renesas/0039-arm64-set-CONFIG_MMC_BCM2835-y-in-defconfig.patch index eef3f0a53e2791..e65952e37ee292 100644 --- a/patches.renesas/0039-arm64-set-CONFIG_MMC_BCM2835-y-in-defconfig.patch +++ b/patches.renesas/0039-arm64-set-CONFIG_MMC_BCM2835-y-in-defconfig.patch @@ -22,7 +22,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -369,6 +369,7 @@ CONFIG_MMC_DW=y +@@ -371,6 +371,7 @@ CONFIG_MMC_DW=y CONFIG_MMC_DW_EXYNOS=y CONFIG_MMC_DW_K3=y CONFIG_MMC_SUNXI=y diff --git a/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch b/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch index cfefa7e6ca3e79..9c4c2713d7f419 100644 --- a/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch +++ b/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch @@ -110,7 +110,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /** * drm_atomic_get_crtc_state - get crtc state -@@ -1748,7 +1744,7 @@ retry: +@@ -1750,7 +1746,7 @@ retry: if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) { /* * Unlike commit, check_only does not clean up state. @@ -119,7 +119,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> */ ret = drm_atomic_check_only(state); } else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) { -@@ -1781,8 +1777,7 @@ out: +@@ -1783,8 +1779,7 @@ out: goto retry; } diff --git a/patches.renesas/0043-arm64-defconfig-Enable-video-DRM-and-LPASS-drivers-f.patch b/patches.renesas/0043-arm64-defconfig-Enable-video-DRM-and-LPASS-drivers-f.patch index 2d05e1a53450e3..dcb3c6315d2e75 100644 --- a/patches.renesas/0043-arm64-defconfig-Enable-video-DRM-and-LPASS-drivers-f.patch +++ b/patches.renesas/0043-arm64-defconfig-Enable-video-DRM-and-LPASS-drivers-f.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -279,6 +279,7 @@ CONFIG_RENESAS_WDT=y +@@ -281,6 +281,7 @@ CONFIG_RENESAS_WDT=y CONFIG_S3C2410_WATCHDOG=y CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m @@ -28,7 +28,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> CONFIG_MFD_MAX77620=y CONFIG_MFD_SPMI_PMIC=y CONFIG_MFD_SEC_CORE=y -@@ -302,10 +303,20 @@ CONFIG_MEDIA_CONTROLLER=y +@@ -304,10 +305,20 @@ CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_DVB_NET is not set CONFIG_V4L_MEM2MEM_DRIVERS=y diff --git a/patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch b/patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch index f46c4d6c1f0c00..62227149f84bd5 100644 --- a/patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch +++ b/patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig -@@ -487,6 +487,7 @@ CONFIG_MEMTEST=y +@@ -489,6 +489,7 @@ CONFIG_MEMTEST=y CONFIG_SECURITY=y CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_ANSI_CPRNG=y diff --git a/patches.renesas/0049-i2c-rcar-fix-resume-by-always-initializing-registers.patch b/patches.renesas/0049-i2c-rcar-fix-resume-by-always-initializing-registers.patch deleted file mode 100644 index ab3f370047d7a6..00000000000000 --- a/patches.renesas/0049-i2c-rcar-fix-resume-by-always-initializing-registers.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 78ded0f782b36fc9716b27771bd543fb7cd74575 Mon Sep 17 00:00:00 2001 -From: Wolfram Sang <wsa+renesas@sang-engineering.com> -Date: Tue, 18 Apr 2017 20:38:35 +0200 -Subject: [PATCH 049/286] i2c: rcar: fix resume by always initializing - registers before transfer - -Resume failed because of uninitialized registers. Instead of adding a -resume callback, we simply initialize registers before every transfer. -This lightweight change is more robust and will keep us safe if we ever -need support for power domains or dynamic frequency changes. - -Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> -Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Signed-off-by: Wolfram Sang <wsa@the-dreams.de> -(cherry picked from commit ae481cc139658e89eb3ea671dd00b67bd87f01a3) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/i2c/busses/i2c-rcar.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/i2c/busses/i2c-rcar.c -+++ b/drivers/i2c/busses/i2c-rcar.c -@@ -700,6 +700,8 @@ static int rcar_i2c_master_xfer(struct i - - pm_runtime_get_sync(dev); - -+ rcar_i2c_init(priv); -+ - ret = rcar_i2c_bus_barrier(priv); - if (ret < 0) - goto out; -@@ -860,8 +862,6 @@ static int rcar_i2c_probe(struct platfor - if (ret < 0) - goto out_pm_put; - -- rcar_i2c_init(priv); -- - /* Don't suspend when multi-master to keep arbitration working */ - if (of_property_read_bool(dev->of_node, "multi-master")) - priv->flags |= ID_P_PM_BLOCKED; diff --git a/patches.renesas/0056-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch b/patches.renesas/0056-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch deleted file mode 100644 index 249ce85e6fdd1d..00000000000000 --- a/patches.renesas/0056-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d3f0852f138f74a6c4a827ff1b13c95019dd3b88 Mon Sep 17 00:00:00 2001 -From: Heiner Kallweit <hkallweit1@gmail.com> -Date: Fri, 28 Oct 2016 07:58:46 +0200 -Subject: [PATCH 056/255] mtd: m25p80: consider max message size in m25p80_read - -Consider a message size limit when calculating the maximum amount -of data that can be read. - -The message size limit has been introduced with 4.9, so cc it -to stable. - -Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> -Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com> -(cherry picked from commit 9e276de6a367cde07c1a63522152985d4e5cca8b) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/mtd/devices/m25p80.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -172,7 +172,8 @@ static ssize_t m25p80_read(struct spi_no - - t[1].rx_buf = buf; - t[1].rx_nbits = m25p80_rx_nbits(nor); -- t[1].len = min(len, spi_max_transfer_size(spi)); -+ t[1].len = min3(len, spi_max_transfer_size(spi), -+ spi_max_message_size(spi) - t[0].len); - spi_message_add_tail(&t[1], &m); - - ret = spi_sync(spi, &m); diff --git a/patches.renesas/0067-ARM-dts-sh73a0-Use-SoC-specific-compat-string-for-mm.patch b/patches.renesas/0067-ARM-dts-sh73a0-Use-SoC-specific-compat-string-for-mm.patch index c6bf4cc2a84954..bde8e370096bfe 100644 --- a/patches.renesas/0067-ARM-dts-sh73a0-Use-SoC-specific-compat-string-for-mm.patch +++ b/patches.renesas/0067-ARM-dts-sh73a0-Use-SoC-specific-compat-string-for-mm.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/arch/arm/boot/dts/sh73a0.dtsi +++ b/arch/arm/boot/dts/sh73a0.dtsi -@@ -263,7 +263,7 @@ +@@ -264,7 +264,7 @@ }; mmcif: mmc@e6bd0000 { diff --git a/patches.renesas/0087-rcar-dmac-fixup-descriptor-pointer-for-descriptor-mo.patch b/patches.renesas/0087-rcar-dmac-fixup-descriptor-pointer-for-descriptor-mo.patch index 465005303be673..7832d9cea2c83e 100644 --- a/patches.renesas/0087-rcar-dmac-fixup-descriptor-pointer-for-descriptor-mo.patch +++ b/patches.renesas/0087-rcar-dmac-fixup-descriptor-pointer-for-descriptor-mo.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c -@@ -1287,6 +1287,9 @@ static unsigned int rcar_dmac_chan_get_r +@@ -1296,6 +1296,9 @@ static unsigned int rcar_dmac_chan_get_r if (desc->hwdescs.use) { dptr = (rcar_dmac_chan_read(chan, RCAR_DMACHCRB) & RCAR_DMACHCRB_DPTR_MASK) >> RCAR_DMACHCRB_DPTR_SHIFT; diff --git a/patches.renesas/0104-net-phy-micrel-fix-crash-when-statistic-requested-fo.patch b/patches.renesas/0104-net-phy-micrel-fix-crash-when-statistic-requested-fo.patch deleted file mode 100644 index 96850d563f6104..00000000000000 --- a/patches.renesas/0104-net-phy-micrel-fix-crash-when-statistic-requested-fo.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 4ed77a4318233c728d3dd110c065a2ce24c69131 Mon Sep 17 00:00:00 2001 -From: Grygorii Strashko <grygorii.strashko@ti.com> -Date: Thu, 13 Apr 2017 14:11:27 -0500 -Subject: [PATCH 104/255] net: phy: micrel: fix crash when statistic requested - for KSZ9031 phy - -Now the command: - ethtool --phy-statistics eth0 -will cause system crash with meassage "Unable to handle kernel NULL pointer -dereference at virtual address 00000010" from: - - (kszphy_get_stats) from [<c069f1d8>] (ethtool_get_phy_stats+0xd8/0x210) - (ethtool_get_phy_stats) from [<c06a0738>] (dev_ethtool+0x5b8/0x228c) - (dev_ethtool) from [<c06b5484>] (dev_ioctl+0x3fc/0x964) - (dev_ioctl) from [<c0679f7c>] (sock_ioctl+0x170/0x2c0) - (sock_ioctl) from [<c02419d4>] (do_vfs_ioctl+0xa8/0x95c) - (do_vfs_ioctl) from [<c02422c4>] (SyS_ioctl+0x3c/0x64) - (SyS_ioctl) from [<c0107d60>] (ret_fast_syscall+0x0/0x44) - -The reason: phy_driver structure for KSZ9031 phy has no .probe() callback -defined. As result, struct phy_device *phydev->priv pointer will not be -initializes (null). -This issue will affect also following phys: - KSZ8795, KSZ886X, KSZ8873MLL, KSZ9031, KSZ9021, KSZ8061, KS8737 - -Fix it by: -- adding .probe() = kszphy_probe() callback to KSZ9031, KSZ9021 -phys. The kszphy_probe() can be re-used as it doesn't do any phy specific -settings. -- removing statistic callbacks from other phys (KSZ8795, KSZ886X, -KSZ8873MLL, KSZ8061, KS8737) as they doesn't have corresponding -statistic counters. - -Fixes: 2b2427d06426 ("phy: micrel: Add ethtool statistics counters") -Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> -Reviewed-by: Andrew Lunn <andrew@lunn.ch> -Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -(cherry picked from commit bfe72442578bb112626e476ffe1f276504d85b95) -Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ---- - drivers/net/phy/micrel.c | 17 ++--------------- - 1 file changed, 2 insertions(+), 15 deletions(-) - ---- a/drivers/net/phy/micrel.c -+++ b/drivers/net/phy/micrel.c -@@ -801,9 +801,6 @@ static struct phy_driver ksphy_driver[] - .read_status = genphy_read_status, - .ack_interrupt = kszphy_ack_interrupt, - .config_intr = kszphy_config_intr, -- .get_sset_count = kszphy_get_sset_count, -- .get_strings = kszphy_get_strings, -- .get_stats = kszphy_get_stats, - .suspend = genphy_suspend, - .resume = genphy_resume, - }, { -@@ -943,9 +940,6 @@ static struct phy_driver ksphy_driver[] - .read_status = genphy_read_status, - .ack_interrupt = kszphy_ack_interrupt, - .config_intr = kszphy_config_intr, -- .get_sset_count = kszphy_get_sset_count, -- .get_strings = kszphy_get_strings, -- .get_stats = kszphy_get_stats, - .suspend = genphy_suspend, - .resume = genphy_resume, - }, { -@@ -955,6 +949,7 @@ static struct phy_driver ksphy_driver[] - .features = PHY_GBIT_FEATURES, - .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, - .driver_data = &ksz9021_type, -+ .probe = kszphy_probe, - .config_init = ksz9021_config_init, - .config_aneg = genphy_config_aneg, - .read_status = genphy_read_status, -@@ -974,6 +969,7 @@ static struct phy_driver ksphy_driver[] - .features = PHY_GBIT_FEATURES, - .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, - .driver_data = &ksz9021_type, -+ .probe = kszphy_probe, - .config_init = ksz9031_config_init, - .config_aneg = genphy_config_aneg, - .read_status = ksz9031_read_status, -@@ -992,9 +988,6 @@ static struct phy_driver ksphy_driver[] - .config_init = kszphy_config_init, - .config_aneg = ksz8873mll_config_aneg, - .read_status = ksz8873mll_read_status, -- .get_sset_count = kszphy_get_sset_count, -- .get_strings = kszphy_get_strings, -- .get_stats = kszphy_get_stats, - .suspend = genphy_suspend, - .resume = genphy_resume, - }, { -@@ -1006,9 +999,6 @@ static struct phy_driver ksphy_driver[] - .config_init = kszphy_config_init, - .config_aneg = genphy_config_aneg, - .read_status = genphy_read_status, -- .get_sset_count = kszphy_get_sset_count, -- .get_strings = kszphy_get_strings, -- .get_stats = kszphy_get_stats, - .suspend = genphy_suspend, - .resume = genphy_resume, - }, { -@@ -1020,9 +1010,6 @@ static struct phy_driver ksphy_driver[] - .config_init = kszphy_config_init, - .config_aneg = ksz8873mll_config_aneg, - .read_status = ksz8873mll_read_status, -- .get_sset_count = kszphy_get_sset_count, -- .get_strings = kszphy_get_strings, -- .get_stats = kszphy_get_stats, - .suspend = genphy_suspend, - .resume = genphy_resume, - } }; diff --git a/patches.renesas/0105-ASoC-constify-snd_soc_ops-structures.patch b/patches.renesas/0105-ASoC-constify-snd_soc_ops-structures.patch index a0d3d17b06ad09..a0346bd6b56007 100644 --- a/patches.renesas/0105-ASoC-constify-snd_soc_ops-structures.patch +++ b/patches.renesas/0105-ASoC-constify-snd_soc_ops-structures.patch @@ -242,7 +242,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c -@@ -204,11 +204,11 @@ static int cht_max98090_headset_init(str +@@ -221,11 +221,11 @@ static int cht_max98090_headset_init(str return ts3a227e_enable_jack_detect(component, &ctx->jack); } diff --git a/patches.renesas/0108-dmaengine-rcar-dmac-Widen-DMA-mask-to-40-bits.patch b/patches.renesas/0108-dmaengine-rcar-dmac-Widen-DMA-mask-to-40-bits.patch index 8ebe1494478147..3c53c0dda7dd27 100644 --- a/patches.renesas/0108-dmaengine-rcar-dmac-Widen-DMA-mask-to-40-bits.patch +++ b/patches.renesas/0108-dmaengine-rcar-dmac-Widen-DMA-mask-to-40-bits.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c -@@ -1724,6 +1724,7 @@ static int rcar_dmac_probe(struct platfo +@@ -1733,6 +1733,7 @@ static int rcar_dmac_probe(struct platfo dmac->dev = &pdev->dev; platform_set_drvdata(pdev, dmac); diff --git a/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch b/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch index 7d5adb72b307d1..ca3a9999aa26f9 100644 --- a/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch +++ b/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c -@@ -3241,7 +3241,8 @@ static int sh_eth_drv_probe(struct platf +@@ -3214,7 +3214,8 @@ static int sh_eth_drv_probe(struct platf /* MDIO bus init */ ret = sh_mdio_init(mdp, pd); if (ret) { diff --git a/patches.renesas/0123-ata-pass-queued-command-to-sff_data_xfer-method.patch b/patches.renesas/0123-ata-pass-queued-command-to-sff_data_xfer-method.patch index 81016f89647ea1..12b0c507eb11a9 100644 --- a/patches.renesas/0123-ata-pass-queued-command-to-sff_data_xfer-method.patch +++ b/patches.renesas/0123-ata-pass-queued-command-to-sff_data_xfer-method.patch @@ -382,7 +382,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/include/linux/libata.h +++ b/include/linux/libata.h -@@ -963,7 +963,7 @@ struct ata_port_operations { +@@ -964,7 +964,7 @@ struct ata_port_operations { void (*sff_tf_read)(struct ata_port *ap, struct ata_taskfile *tf); void (*sff_exec_command)(struct ata_port *ap, const struct ata_taskfile *tf); @@ -391,7 +391,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> unsigned char *buf, unsigned int buflen, int rw); void (*sff_irq_on)(struct ata_port *); bool (*sff_irq_check)(struct ata_port *); -@@ -1818,11 +1818,11 @@ extern void ata_sff_tf_load(struct ata_p +@@ -1819,11 +1819,11 @@ extern void ata_sff_tf_load(struct ata_p extern void ata_sff_tf_read(struct ata_port *ap, struct ata_taskfile *tf); extern void ata_sff_exec_command(struct ata_port *ap, const struct ata_taskfile *tf); diff --git a/patches.renesas/0128-sh_eth-rename-sh_eth_cpu_data-hw_crc.patch b/patches.renesas/0128-sh_eth-rename-sh_eth_cpu_data-hw_crc.patch index dedf3f05e79a3b..5c31e2af0c7d5d 100644 --- a/patches.renesas/0128-sh_eth-rename-sh_eth_cpu_data-hw_crc.patch +++ b/patches.renesas/0128-sh_eth-rename-sh_eth_cpu_data-hw_crc.patch @@ -62,7 +62,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> desc_status >>= 16; skb = mdp->rx_skbuff[entry]; -@@ -1999,7 +1999,7 @@ static size_t __sh_eth_get_regs(struct n +@@ -1980,7 +1980,7 @@ static size_t __sh_eth_get_regs(struct n add_reg(MAFCR); if (cd->rtrate) add_reg(RTRATE); diff --git a/patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch b/patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch index b9bb53f1a7d5d3..555d868a6fe691 100644 --- a/patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch +++ b/patches.renesas/0130-sh_eth-add-generic-wake-on-lan-support-via-magic-pac.patch @@ -49,7 +49,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } /* error control function */ -@@ -2211,6 +2213,33 @@ static int sh_eth_set_ringparam(struct n +@@ -2184,6 +2186,33 @@ static int sh_eth_set_ringparam(struct n return 0; } @@ -83,7 +83,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static const struct ethtool_ops sh_eth_ethtool_ops = { .get_regs_len = sh_eth_get_regs_len, .get_regs = sh_eth_get_regs, -@@ -2225,6 +2254,8 @@ static const struct ethtool_ops sh_eth_e +@@ -2198,6 +2227,8 @@ static const struct ethtool_ops sh_eth_e .set_ringparam = sh_eth_set_ringparam, .get_link_ksettings = sh_eth_get_link_ksettings, .set_link_ksettings = sh_eth_set_link_ksettings, @@ -92,7 +92,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> }; /* network device open function */ -@@ -3029,6 +3060,11 @@ static int sh_eth_drv_probe(struct platf +@@ -3002,6 +3033,11 @@ static int sh_eth_drv_probe(struct platf goto out_release; } @@ -104,7 +104,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ndev->base_addr = res->start; spin_lock_init(&mdp->lock); -@@ -3142,6 +3178,9 @@ static int sh_eth_drv_probe(struct platf +@@ -3115,6 +3151,9 @@ static int sh_eth_drv_probe(struct platf if (ret) goto out_napi_del; @@ -114,7 +114,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* print device information */ netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n", (u32)ndev->base_addr, ndev->dev_addr, ndev->irq); -@@ -3181,15 +3220,67 @@ static int sh_eth_drv_remove(struct plat +@@ -3154,15 +3193,67 @@ static int sh_eth_drv_remove(struct plat #ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP @@ -185,7 +185,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return ret; } -@@ -3197,14 +3288,21 @@ static int sh_eth_suspend(struct device +@@ -3170,14 +3261,21 @@ static int sh_eth_suspend(struct device static int sh_eth_resume(struct device *dev) { struct net_device *ndev = dev_get_drvdata(dev); diff --git a/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch b/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch index c843ded5d042a9..ea76afcac49d5f 100644 --- a/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch +++ b/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch @@ -50,7 +50,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> usb3_write(usb3, ~0, USB3_USB_INT_STA_1); usb3_enable_irq_1(usb3, USB_INT_1_VBUS_CNG); } -@@ -538,11 +540,49 @@ static void usb3_check_vbus(struct renes +@@ -545,11 +547,49 @@ static void usb3_check_vbus(struct renes } } @@ -100,7 +100,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> usb3_check_vbus(usb3); } -@@ -551,6 +591,7 @@ static void renesas_usb3_stop_controller +@@ -558,6 +598,7 @@ static void renesas_usb3_stop_controller usb3_disconnect(usb3); usb3_write(usb3, 0, USB3_P0_INT_ENA); usb3_write(usb3, 0, USB3_PN_INT_ENA); @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> usb3_write(usb3, 0, USB3_USB_INT_ENA_1); usb3_write(usb3, 0, USB3_USB_INT_ENA_2); usb3_write(usb3, 0, USB3_AXI_INT_ENA); -@@ -1509,10 +1550,22 @@ static void usb3_irq_epc_int_2(struct re +@@ -1516,10 +1557,22 @@ static void usb3_irq_epc_int_2(struct re } } @@ -131,7 +131,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int_sta_1 &= usb3_read(usb3, USB3_USB_INT_ENA_1); if (int_sta_1) { -@@ -1523,6 +1576,12 @@ static void usb3_irq_epc(struct renesas_ +@@ -1530,6 +1583,12 @@ static void usb3_irq_epc(struct renesas_ int_sta_2 &= usb3_read(usb3, USB3_USB_INT_ENA_2); if (int_sta_2) usb3_irq_epc_int_2(usb3, int_sta_2); diff --git a/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch b/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch index 690d8d6fa1d8d1..c39e440069cf9a 100644 --- a/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch +++ b/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch @@ -68,7 +68,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static void usb3_enable_irq_1(struct renesas_usb3 *usb3, u32 bits) { usb3_set_bit(usb3, bits, USB3_USB_INT_ENA_1); -@@ -533,10 +547,14 @@ static void usb3_check_vbus(struct renes +@@ -540,10 +554,14 @@ static void usb3_check_vbus(struct renes if (usb3->workaround_for_vbus) { usb3_connect(usb3); } else { @@ -84,7 +84,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } } -@@ -569,10 +587,14 @@ static bool usb3_is_a_device(struct rene +@@ -576,10 +594,14 @@ static bool usb3_is_a_device(struct rene static void usb3_check_id(struct renesas_usb3 *usb3) { @@ -100,7 +100,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } static void renesas_usb3_init_controller(struct renesas_usb3 *usb3) -@@ -1997,6 +2019,12 @@ static const struct of_device_id usb3_of +@@ -2004,6 +2026,12 @@ static const struct of_device_id usb3_of }; MODULE_DEVICE_TABLE(of, usb3_of_match); @@ -113,7 +113,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static int renesas_usb3_probe(struct platform_device *pdev) { struct renesas_usb3 *usb3; -@@ -2040,6 +2068,17 @@ static int renesas_usb3_probe(struct pla +@@ -2047,6 +2075,17 @@ static int renesas_usb3_probe(struct pla if (ret < 0) return ret; diff --git a/patches.renesas/0135-sh_eth-rename-EESIPR-bits.patch b/patches.renesas/0135-sh_eth-rename-EESIPR-bits.patch index 14badff5bad4ed..0b0fcb3eabe8b4 100644 --- a/patches.renesas/0135-sh_eth-rename-EESIPR-bits.patch +++ b/patches.renesas/0135-sh_eth-rename-EESIPR-bits.patch @@ -107,7 +107,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (intr_status & (EESR_RX_CHECK | cd->tx_check | EESR_ECI | cd->eesr_err_check)) ret = IRQ_HANDLED; -@@ -3232,7 +3232,7 @@ static int sh_eth_wol_setup(struct net_d +@@ -3205,7 +3205,7 @@ static int sh_eth_wol_setup(struct net_d /* Only allow ECI interrupts */ synchronize_irq(ndev->irq); napi_disable(&mdp->napi); diff --git a/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch b/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch index 9836839e6fde36..84ed12964ba5e8 100644 --- a/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch +++ b/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch @@ -65,7 +65,7 @@ Conflicts: static void usb3_init_axi_bridge(struct renesas_usb3 *usb3) { /* Set AXI_INT */ -@@ -576,8 +581,14 @@ static void usb3_vbus_out(struct renesas +@@ -583,8 +588,14 @@ static void usb3_vbus_out(struct renesas static void usb3_mode_config(struct renesas_usb3 *usb3, bool host, bool a_dev) { @@ -80,7 +80,7 @@ Conflicts: } static bool usb3_is_a_device(struct renesas_usb3 *usb3) -@@ -1884,11 +1895,49 @@ static const struct usb_gadget_ops renes +@@ -1891,11 +1902,49 @@ static const struct usb_gadget_ops renes .set_selfpowered = renesas_usb3_set_selfpowered, }; @@ -130,7 +130,7 @@ Conflicts: usb_del_gadget_udc(&usb3->gadget); __renesas_usb3_ep_free_request(usb3->ep0_req); -@@ -2088,12 +2137,19 @@ static int renesas_usb3_probe(struct pla +@@ -2095,12 +2144,19 @@ static int renesas_usb3_probe(struct pla if (ret < 0) goto err_add_udc; diff --git a/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch b/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch index dbcb72fe54fef8..1f0c69315334ad 100644 --- a/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch +++ b/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch @@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c -@@ -1863,6 +1863,9 @@ static int renesas_usb3_stop(struct usb_ +@@ -1870,6 +1870,9 @@ static int renesas_usb3_stop(struct usb_ pm_runtime_put(usb3_to_dev(usb3)); pm_runtime_disable(usb3_to_dev(usb3)); diff --git a/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch b/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch index d6f90dc0de97cd..9cf92fb63a9674 100644 --- a/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch +++ b/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch @@ -23,7 +23,7 @@ Conflicts: --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c -@@ -1863,9 +1863,6 @@ static int renesas_usb3_stop(struct usb_ +@@ -1870,9 +1870,6 @@ static int renesas_usb3_stop(struct usb_ pm_runtime_put(usb3_to_dev(usb3)); pm_runtime_disable(usb3_to_dev(usb3)); diff --git a/patches.renesas/0138-sh_eth-align-usage-of-sh_eth_modify-with-rest-of-dri.patch b/patches.renesas/0138-sh_eth-align-usage-of-sh_eth_modify-with-rest-of-dri.patch index 1a3bdb57bf265a..c4b3ce73de0d61 100644 --- a/patches.renesas/0138-sh_eth-align-usage-of-sh_eth_modify-with-rest-of-dri.patch +++ b/patches.renesas/0138-sh_eth-align-usage-of-sh_eth_modify-with-rest-of-dri.patch @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c -@@ -3304,7 +3304,7 @@ static int sh_eth_wol_setup(struct net_d +@@ -3277,7 +3277,7 @@ static int sh_eth_wol_setup(struct net_d sh_eth_write(ndev, EESIPR_ECIIP, EESIPR); /* Enable MagicPacket */ diff --git a/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch b/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch index ff979954f0d04c..0c4ae6dc377fa0 100644 --- a/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch +++ b/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c -@@ -623,7 +623,6 @@ static void renesas_usb3_stop_controller +@@ -630,7 +630,6 @@ static void renesas_usb3_stop_controller { usb3_disconnect(usb3); usb3_write(usb3, 0, USB3_P0_INT_ENA); @@ -27,7 +27,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> usb3_write(usb3, 0, USB3_USB_OTG_INT_ENA); usb3_write(usb3, 0, USB3_USB_INT_ENA_1); usb3_write(usb3, 0, USB3_USB_INT_ENA_2); -@@ -1704,6 +1703,7 @@ static int usb3_disable_pipe_n(struct re +@@ -1711,6 +1710,7 @@ static int usb3_disable_pipe_n(struct re spin_lock_irqsave(&usb3->lock, flags); if (!usb3_pn_change(usb3, usb3_ep->num)) { diff --git a/patches.renesas/0159-clk-renesas-cpg-mssr-Add-support-for-fixing-up-clock.patch b/patches.renesas/0159-clk-renesas-cpg-mssr-Add-support-for-fixing-up-clock.patch index 5c9cb89c9d516f..c8e7fcd70cc68d 100644 --- a/patches.renesas/0159-clk-renesas-cpg-mssr-Add-support-for-fixing-up-clock.patch +++ b/patches.renesas/0159-clk-renesas-cpg-mssr-Add-support-for-fixing-up-clock.patch @@ -27,7 +27,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c -@@ -265,6 +265,11 @@ static void __init cpg_mssr_register_cor +@@ -266,6 +266,11 @@ static void __init cpg_mssr_register_cor WARN_DEBUG(id >= priv->num_core_clks); WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT); @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> switch (core->type) { case CLK_TYPE_IN: clk = of_clk_get_by_name(priv->dev->of_node, core->name); -@@ -335,6 +340,11 @@ static void __init cpg_mssr_register_mod +@@ -336,6 +341,11 @@ static void __init cpg_mssr_register_mod WARN_DEBUG(mod->parent >= priv->num_core_clks + priv->num_mod_clks); WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT); @@ -51,7 +51,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> parent = priv->clks[mod->parent]; if (IS_ERR(parent)) { clk = parent; -@@ -734,5 +744,45 @@ static int __init cpg_mssr_init(void) +@@ -735,5 +745,45 @@ static int __init cpg_mssr_init(void) subsys_initcall(cpg_mssr_init); diff --git a/patches.renesas/0166-clk-renesas-cpg-mssr-Remove-bogus-commas-from-error-.patch b/patches.renesas/0166-clk-renesas-cpg-mssr-Remove-bogus-commas-from-error-.patch index 1d223677ad0368..d80a66035f7601 100644 --- a/patches.renesas/0166-clk-renesas-cpg-mssr-Remove-bogus-commas-from-error-.patch +++ b/patches.renesas/0166-clk-renesas-cpg-mssr-Remove-bogus-commas-from-error-.patch @@ -13,7 +13,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c -@@ -308,7 +308,7 @@ static void __init cpg_mssr_register_cor +@@ -309,7 +309,7 @@ static void __init cpg_mssr_register_cor return; fail: @@ -22,7 +22,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> core->name, PTR_ERR(clk)); } -@@ -376,7 +376,7 @@ static void __init cpg_mssr_register_mod +@@ -377,7 +377,7 @@ static void __init cpg_mssr_register_mod return; fail: diff --git a/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch b/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch index 0eb33395ac26d5..029c819e4a7d7b 100644 --- a/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch +++ b/patches.renesas/0171-serial-sh-sci-Set-the-SCSCR-TE-and-RE-bits-in-the-dr.patch @@ -29,7 +29,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> dev_dbg(port->dev, "SCSCR 0x%x\n", scr_val); serial_port_out(port, SCSCR, scr_val); if ((srr + 1 == 5) && -@@ -2812,7 +2813,8 @@ static void serial_console_write(struct +@@ -2811,7 +2812,8 @@ static void serial_console_write(struct /* first save SCSCR then disable interrupts, keep clock source */ ctrl = serial_port_in(port, SCSCR); @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> (ctrl & (SCSCR_CKE1 | SCSCR_CKE0)); serial_port_out(port, SCSCR, ctrl_temp); -@@ -3015,7 +3017,6 @@ sci_parse_dt(struct platform_device *pde +@@ -3013,7 +3015,6 @@ sci_parse_dt(struct platform_device *pde p->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; p->type = SCI_OF_TYPE(match->data); p->regtype = SCI_OF_REGTYPE(match->data); @@ -47,7 +47,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (of_find_property(np, "uart-has-rtscts", NULL)) p->capabilities |= SCIx_HAVE_RTSCTS; -@@ -3183,9 +3184,9 @@ static int __init early_console_setup(st +@@ -3181,9 +3182,9 @@ static int __init early_console_setup(st sci_ports[0].cfg = &port_cfg; sci_ports[0].cfg->type = type; sci_probe_regmap(sci_ports[0].cfg); diff --git a/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch b/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch index 0c5e7dd289bf3b..e1523153fed065 100644 --- a/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch +++ b/patches.renesas/0172-serial-sh-sci-Don-t-rely-on-platform-data-flags-when.patch @@ -49,7 +49,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> port->regshift = p->regshift; /* -@@ -3014,7 +3014,6 @@ sci_parse_dt(struct platform_device *pde +@@ -3012,7 +3012,6 @@ sci_parse_dt(struct platform_device *pde *dev_id = id; diff --git a/patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch b/patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch index 9eea24c96b9070..aa1716bc1f06ea 100644 --- a/patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch +++ b/patches.renesas/0175-serial-sh-sci-Replace-regmap-array-with-port-paramet.patch @@ -400,7 +400,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> switch (p->type) { case PORT_SCIFB: port->fifosize = 256; -@@ -3089,6 +3120,7 @@ static int __init early_console_setup(st +@@ -3087,6 +3118,7 @@ static int __init early_console_setup(st sci_ports[0].cfg = &port_cfg; sci_ports[0].cfg->type = type; sci_probe_regmap(sci_ports[0].cfg); diff --git a/patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch b/patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch index 7abc2b555022ee..50249d7b3e4da1 100644 --- a/patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch +++ b/patches.renesas/0176-serial-sh-sci-Constify-platform-data.patch @@ -137,7 +137,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> switch (p->type) { case PORT_SCIFB: -@@ -2826,7 +2828,7 @@ static char early_serial_buf[32]; +@@ -2824,7 +2826,7 @@ static char early_serial_buf[32]; static int sci_probe_earlyprintk(struct platform_device *pdev) { @@ -146,7 +146,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (early_serial_console.data) return -EEXIST; -@@ -3117,10 +3119,9 @@ static int __init early_console_setup(st +@@ -3115,10 +3117,9 @@ static int __init early_console_setup(st device->port.serial_out = sci_serial_out; device->port.type = type; memcpy(&sci_ports[0].port, &device->port, sizeof(struct uart_port)); diff --git a/patches.renesas/0177-usb-xhci-clear-EINT-bit-in-status-correctly.patch b/patches.renesas/0177-usb-xhci-clear-EINT-bit-in-status-correctly.patch index 9c4b4e1bfc1762..ea8dc1669382c8 100644 --- a/patches.renesas/0177-usb-xhci-clear-EINT-bit-in-status-correctly.patch +++ b/patches.renesas/0177-usb-xhci-clear-EINT-bit-in-status-correctly.patch @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> temp = readl(&xhci->ir_set->irq_pending); writel(ER_IRQ_DISABLE(temp), &xhci->ir_set->irq_pending); xhci_print_ir_set(xhci, 0); -@@ -1057,7 +1057,7 @@ int xhci_resume(struct xhci_hcd *xhci, b +@@ -1097,7 +1097,7 @@ int xhci_resume(struct xhci_hcd *xhci, b xhci_dbg(xhci, "// Disabling event ring interrupts\n"); temp = readl(&xhci->op_regs->status); diff --git a/patches.renesas/0179-usb-xhci-Add-helper-function-xhci_disable_slot.patch b/patches.renesas/0179-usb-xhci-Add-helper-function-xhci_disable_slot.patch index ec0d41490d3920..bb7fbf51813469 100644 --- a/patches.renesas/0179-usb-xhci-Add-helper-function-xhci_disable_slot.patch +++ b/patches.renesas/0179-usb-xhci-Add-helper-function-xhci_disable_slot.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -3564,8 +3564,6 @@ void xhci_free_dev(struct usb_hcd *hcd, +@@ -3603,8 +3603,6 @@ void xhci_free_dev(struct usb_hcd *hcd, { struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_virt_device *virt_dev; @@ -28,7 +28,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int i, ret; struct xhci_command *command; -@@ -3600,30 +3598,50 @@ void xhci_free_dev(struct usb_hcd *hcd, +@@ -3639,30 +3637,50 @@ void xhci_free_dev(struct usb_hcd *hcd, del_timer_sync(&virt_dev->eps[i].stop_cmd_timer); } @@ -89,7 +89,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } /* -@@ -3730,15 +3748,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, +@@ -3769,15 +3787,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, disable_slot: /* Disable slot, if we can do it without mem alloc */ @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2021,6 +2021,8 @@ void xhci_shutdown(struct usb_hcd *hcd); +@@ -2025,6 +2025,8 @@ void xhci_shutdown(struct usb_hcd *hcd); int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks); void xhci_init_driver(struct hc_driver *drv, const struct xhci_driver_overrides *over); diff --git a/patches.renesas/0180-usb-xhci-Expose-xhci_start-function.patch b/patches.renesas/0180-usb-xhci-Expose-xhci_start-function.patch index 0d329e2f3af7eb..5a1fe5c6ca976e 100644 --- a/patches.renesas/0180-usb-xhci-Expose-xhci_start-function.patch +++ b/patches.renesas/0180-usb-xhci-Expose-xhci_start-function.patch @@ -29,7 +29,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int ret; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2013,6 +2013,7 @@ typedef void (*xhci_get_quirks_t)(struct +@@ -2017,6 +2017,7 @@ typedef void (*xhci_get_quirks_t)(struct int xhci_handshake(void __iomem *ptr, u32 mask, u32 done, int usec); void xhci_quiesce(struct xhci_hcd *xhci); int xhci_halt(struct xhci_hcd *xhci); diff --git a/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch b/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch index b4a484dff44958..5087f8826e35be 100644 --- a/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch +++ b/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch @@ -155,7 +155,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -425,6 +425,7 @@ struct xhci_op_regs { +@@ -429,6 +429,7 @@ struct xhci_op_regs { #define PORT_L1DS_MASK (0xff << 8) #define PORT_L1DS(p) (((p) & 0xff) << 8) #define PORT_HLE (1 << 16) @@ -163,7 +163,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* USB3 Protocol PORTLI Port Link Information */ #define PORT_RX_LANES(p) (((p) >> 16) & 0xf) -@@ -1846,6 +1847,7 @@ struct xhci_hcd { +@@ -1850,6 +1851,7 @@ struct xhci_hcd { /* Compliance Mode Recovery Data */ struct timer_list comp_mode_recovery_timer; u32 port_status_u0; diff --git a/patches.renesas/0182-usb-host-xhci-extract-xhci_slot_state_string.patch b/patches.renesas/0182-usb-host-xhci-extract-xhci_slot_state_string.patch index 0a361769d37674..b73d2644895be5 100644 --- a/patches.renesas/0182-usb-host-xhci-extract-xhci_slot_state_string.patch +++ b/patches.renesas/0182-usb-host-xhci-extract-xhci_slot_state_string.patch @@ -43,7 +43,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static void xhci_dbg_slot_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx) --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2161,6 +2161,22 @@ static inline struct xhci_ring *xhci_urb +@@ -2165,6 +2165,22 @@ static inline struct xhci_ring *xhci_urb urb->stream_id); } diff --git a/patches.renesas/0183-usb-host-xhci-add-Slot-and-EP-Context-tracers.patch b/patches.renesas/0183-usb-host-xhci-add-Slot-and-EP-Context-tracers.patch index 31e22bab91c397..b896136226b2b2 100644 --- a/patches.renesas/0183-usb-host-xhci-add-Slot-and-EP-Context-tracers.patch +++ b/patches.renesas/0183-usb-host-xhci-add-Slot-and-EP-Context-tracers.patch @@ -249,7 +249,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* this part must be outside header guard */ --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -3449,6 +3449,8 @@ int xhci_discover_or_reset_device(struct +@@ -3488,6 +3488,8 @@ int xhci_discover_or_reset_device(struct SLOT_STATE_DISABLED) return 0; @@ -258,7 +258,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_dbg(xhci, "Resetting device with slot ID %u\n", slot_id); /* Allocate the command structure that holds the struct completion. * Assume we're in process context, since the normal device reset -@@ -3564,6 +3566,7 @@ void xhci_free_dev(struct usb_hcd *hcd, +@@ -3603,6 +3605,7 @@ void xhci_free_dev(struct usb_hcd *hcd, { struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_virt_device *virt_dev; @@ -266,7 +266,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int i, ret; struct xhci_command *command; -@@ -3591,6 +3594,8 @@ void xhci_free_dev(struct usb_hcd *hcd, +@@ -3630,6 +3633,8 @@ void xhci_free_dev(struct usb_hcd *hcd, } virt_dev = xhci->devs[udev->slot_id]; @@ -275,7 +275,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Stop any wayward timer functions (which may grab the lock) */ for (i = 0; i < 31; i++) { -@@ -3674,6 +3679,8 @@ static int xhci_reserve_host_control_ep_ +@@ -3713,6 +3718,8 @@ static int xhci_reserve_host_control_ep_ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev) { struct xhci_hcd *xhci = hcd_to_xhci(hcd); @@ -284,7 +284,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> unsigned long flags; int ret, slot_id; struct xhci_command *command; -@@ -3729,6 +3736,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, +@@ -3768,6 +3775,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, xhci_warn(xhci, "Could not allocate xHCI USB device data structures\n"); goto disable_slot; } @@ -295,7 +295,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> udev->slot_id = slot_id; #ifndef CONFIG_USB_DEFAULT_PERSIST -@@ -3798,9 +3809,10 @@ static int xhci_setup_device(struct usb_ +@@ -3837,9 +3848,10 @@ static int xhci_setup_device(struct usb_ ret = -EINVAL; goto out; } @@ -307,7 +307,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (GET_SLOT_STATE(le32_to_cpu(slot_ctx->dev_state)) == SLOT_STATE_DEFAULT) { xhci_dbg(xhci, "Slot already in default state\n"); -@@ -3921,7 +3933,6 @@ static int xhci_setup_device(struct usb_ +@@ -3960,7 +3972,6 @@ static int xhci_setup_device(struct usb_ * USB core uses address 1 for the roothubs, so we add one to the * address given back to us by the HC. */ @@ -317,7 +317,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Zero the input context control for later use */ --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -618,6 +618,7 @@ struct xhci_slot_ctx { +@@ -622,6 +622,7 @@ struct xhci_slot_ctx { #define ROUTE_STRING_MASK (0xfffff) /* Device speed - values defined by PORTSC Device Speed field - 20:23 */ #define DEV_SPEED (0xf << 20) @@ -325,7 +325,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* bit 24 reserved */ /* Is this LS/FS device connected through a HS hub? - bit 25 */ #define DEV_MTT (0x1 << 25) -@@ -638,6 +639,7 @@ struct xhci_slot_ctx { +@@ -642,6 +643,7 @@ struct xhci_slot_ctx { #define DEVINFO_TO_ROOT_HUB_PORT(p) (((p) >> 16) & 0xff) /* Maximum number of ports under a hub device */ #define XHCI_MAX_PORTS(p) (((p) & 0xff) << 24) @@ -333,7 +333,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* tt_info bitmasks */ /* -@@ -652,6 +654,7 @@ struct xhci_slot_ctx { +@@ -656,6 +658,7 @@ struct xhci_slot_ctx { */ #define TT_PORT (0xff << 8) #define TT_THINK_TIME(p) (((p) & 0x3) << 16) @@ -341,7 +341,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* dev_state bitmasks */ /* USB device address - assigned by the HC */ -@@ -2383,5 +2386,148 @@ static inline const char *xhci_decode_tr +@@ -2387,5 +2390,148 @@ static inline const char *xhci_decode_tr return str; } diff --git a/patches.renesas/0183-xhci-rename-EP_HALT_PENDING-to-EP_STOP_CMD_PENDING.patch b/patches.renesas/0183-xhci-rename-EP_HALT_PENDING-to-EP_STOP_CMD_PENDING.patch index ab21ccb683e9bd..4a6fad9520a81c 100644 --- a/patches.renesas/0183-xhci-rename-EP_HALT_PENDING-to-EP_STOP_CMD_PENDING.patch +++ b/patches.renesas/0183-xhci-rename-EP_HALT_PENDING-to-EP_STOP_CMD_PENDING.patch @@ -48,7 +48,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> "exiting."); --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1569,13 +1569,13 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1608,13 +1608,13 @@ int xhci_urb_dequeue(struct usb_hcd *hcd /* Queue a stop endpoint command, but only if this is * the first cancellation to be handled. */ @@ -64,7 +64,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ep->stop_cmds_pending++; ep->stop_cmd_timer.expires = jiffies + XHCI_STOP_EP_CMD_TIMEOUT * HZ; -@@ -3616,7 +3616,7 @@ void xhci_free_dev(struct usb_hcd *hcd, +@@ -3655,7 +3655,7 @@ void xhci_free_dev(struct usb_hcd *hcd, /* Stop any wayward timer functions (which may grab the lock) */ for (i = 0; i < 31; ++i) { @@ -75,7 +75,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -912,7 +912,7 @@ struct xhci_virt_ep { +@@ -916,7 +916,7 @@ struct xhci_virt_ep { unsigned int ep_state; #define SET_DEQ_PENDING (1 << 0) #define EP_HALTED (1 << 1) /* For stall handling */ diff --git a/patches.renesas/0184-usb-host-xhci-fix-up-Control-Transfer-TRB-decoder.patch b/patches.renesas/0184-usb-host-xhci-fix-up-Control-Transfer-TRB-decoder.patch index f222d1f1ec6ec3..26826045246bd4 100644 --- a/patches.renesas/0184-usb-host-xhci-fix-up-Control-Transfer-TRB-decoder.patch +++ b/patches.renesas/0184-usb-host-xhci-fix-up-Control-Transfer-TRB-decoder.patch @@ -17,7 +17,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2220,31 +2220,46 @@ static inline const char *xhci_decode_tr +@@ -2224,31 +2224,46 @@ static inline const char *xhci_decode_tr break; case TRB_SETUP: diff --git a/patches.renesas/0184-xhci-detect-stop-endpoint-race-using-pending-timer-i.patch b/patches.renesas/0184-xhci-detect-stop-endpoint-race-using-pending-timer-i.patch index fa2d1c38e706e9..0a5d795410b3cf 100644 --- a/patches.renesas/0184-xhci-detect-stop-endpoint-race-using-pending-timer-i.patch +++ b/patches.renesas/0184-xhci-detect-stop-endpoint-race-using-pending-timer-i.patch @@ -87,7 +87,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> spin_unlock_irqrestore(&xhci->lock, flags); --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1576,7 +1576,6 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1615,7 +1615,6 @@ int xhci_urb_dequeue(struct usb_hcd *hcd goto done; } ep->ep_state |= EP_STOP_CMD_PENDING; @@ -97,7 +97,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> add_timer(&ep->stop_cmd_timer); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -924,7 +924,6 @@ struct xhci_virt_ep { +@@ -928,7 +928,6 @@ struct xhci_virt_ep { unsigned int stopped_stream; /* Watchdog timer for stop endpoint command to cancel URBs */ struct timer_list stop_cmd_timer; diff --git a/patches.renesas/0187-usb-host-xhci-Remove-unused-addr_64-variable-in-xhci.patch b/patches.renesas/0187-usb-host-xhci-Remove-unused-addr_64-variable-in-xhci.patch index ef1b3466a1827e..0a7406abb5954c 100644 --- a/patches.renesas/0187-usb-host-xhci-Remove-unused-addr_64-variable-in-xhci.patch +++ b/patches.renesas/0187-usb-host-xhci-Remove-unused-addr_64-variable-in-xhci.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1548,7 +1548,6 @@ struct xhci_hcd { +@@ -1552,7 +1552,6 @@ struct xhci_hcd { u8 max_ports; u8 isoc_threshold; int event_ring_max; diff --git a/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch b/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch index d1c9980d723c12..945ae45aad5660 100644 --- a/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch +++ b/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch @@ -262,7 +262,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1507,10 +1507,16 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1546,10 +1546,16 @@ int xhci_urb_dequeue(struct usb_hcd *hcd if (!ep || !ep_ring) goto err_giveback; @@ -281,7 +281,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> for (i = urb_priv->num_tds_done; i < urb_priv->num_tds; i++) { -@@ -2601,6 +2607,12 @@ static int xhci_configure_endpoint(struc +@@ -2640,6 +2646,12 @@ static int xhci_configure_endpoint(struc return -EINVAL; spin_lock_irqsave(&xhci->lock, flags); @@ -296,7 +296,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ctrl_ctx = xhci_get_input_control_ctx(command->in_ctx); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2134,6 +2134,7 @@ int xhci_hub_control(struct usb_hcd *hcd +@@ -2138,6 +2138,7 @@ int xhci_hub_control(struct usb_hcd *hcd char *buf, u16 wLength); int xhci_hub_status_data(struct usb_hcd *hcd, char *buf); int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1); diff --git a/patches.renesas/0189-usb-xhci-remove-xhci_dbg_ep_rings.patch b/patches.renesas/0189-usb-xhci-remove-xhci_dbg_ep_rings.patch index d9dd1cd3959be3..88a5d28eccac00 100644 --- a/patches.renesas/0189-usb-xhci-remove-xhci_dbg_ep_rings.patch +++ b/patches.renesas/0189-usb-xhci-remove-xhci_dbg_ep_rings.patch @@ -51,7 +51,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> u64 addr = erst->erst_dma_addr; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1936,9 +1936,6 @@ void xhci_dbg_ring_ptrs(struct xhci_hcd +@@ -1940,9 +1940,6 @@ void xhci_dbg_ring_ptrs(struct xhci_hcd void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep); char *xhci_get_slot_state(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx); diff --git a/patches.renesas/0190-usb-xhci-make-several-functions-static.patch b/patches.renesas/0190-usb-xhci-make-several-functions-static.patch index a7eb73b19f8a2c..78fbc147741260 100644 --- a/patches.renesas/0190-usb-xhci-make-several-functions-static.patch +++ b/patches.renesas/0190-usb-xhci-make-several-functions-static.patch @@ -45,7 +45,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { struct xhci_hcd *xhci = hcd_to_xhci(hcd); -@@ -1182,7 +1182,7 @@ unsigned int xhci_get_endpoint_address(u +@@ -1221,7 +1221,7 @@ unsigned int xhci_get_endpoint_address(u * endpoint index to create a bitmask. The slot context is bit 0, endpoint 0 is * bit 1, etc. */ @@ -54,7 +54,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { return 1 << (xhci_get_endpoint_index(desc) + 1); } -@@ -1191,7 +1191,7 @@ unsigned int xhci_get_endpoint_flag(stru +@@ -1230,7 +1230,7 @@ unsigned int xhci_get_endpoint_flag(stru * endpoint index to create a bitmask. The slot context is bit 0, endpoint 0 is * bit 1, etc. */ @@ -63,7 +63,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { return 1 << (ep_index + 1); } -@@ -1335,7 +1335,7 @@ command_cleanup: +@@ -1374,7 +1374,7 @@ command_cleanup: * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ @@ -72,7 +72,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { struct xhci_hcd *xhci = hcd_to_xhci(hcd); unsigned long flags; -@@ -1471,7 +1471,7 @@ free_priv: +@@ -1510,7 +1510,7 @@ free_priv: * Note that this function can be called in any context, or so says * usb_hcd_unlink_urb() */ @@ -81,7 +81,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { unsigned long flags; int ret, i; -@@ -1588,7 +1588,7 @@ err_giveback: +@@ -1627,7 +1627,7 @@ err_giveback: * disabled, so there's no need for mutual exclusion to protect * the xhci->devs[slot_id] structure. */ @@ -90,7 +90,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_host_endpoint *ep) { struct xhci_hcd *xhci; -@@ -1671,7 +1671,7 @@ int xhci_drop_endpoint(struct usb_hcd *h +@@ -1710,7 +1710,7 @@ int xhci_drop_endpoint(struct usb_hcd *h * configuration or alt setting is installed in the device, so there's no need * for mutual exclusion to protect the xhci->devs[slot_id] structure. */ @@ -99,7 +99,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_host_endpoint *ep) { struct xhci_hcd *xhci; -@@ -2342,7 +2342,7 @@ static unsigned int xhci_get_ss_bw_consu +@@ -2381,7 +2381,7 @@ static unsigned int xhci_get_ss_bw_consu } @@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct xhci_bw_info *ep_bw, struct xhci_interval_bw_table *bw_table, struct usb_device *udev, -@@ -2707,7 +2707,7 @@ static void xhci_check_bw_drop_ep_stream +@@ -2746,7 +2746,7 @@ static void xhci_check_bw_drop_ep_stream * else should be touching the xhci->devs[slot_id] structure, so we * don't need to take the xhci->lock for manipulating that. */ @@ -117,7 +117,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { int i; int ret = 0; -@@ -2811,7 +2811,7 @@ command_cleanup: +@@ -2850,7 +2850,7 @@ command_cleanup: return ret; } @@ -126,7 +126,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { struct xhci_hcd *xhci; struct xhci_virt_device *virt_dev; -@@ -2937,7 +2937,7 @@ void xhci_cleanup_stalled_ring(struct xh +@@ -2976,7 +2976,7 @@ void xhci_cleanup_stalled_ring(struct xh * Context: in_interrupt */ @@ -135,7 +135,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_host_endpoint *ep) { struct xhci_hcd *xhci; -@@ -3113,7 +3113,7 @@ static u32 xhci_calculate_no_streams_bit +@@ -3152,7 +3152,7 @@ static u32 xhci_calculate_no_streams_bit * hardware or endpoints claim they can't support the number of requested * stream IDs. */ @@ -144,7 +144,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_host_endpoint **eps, unsigned int num_eps, unsigned int num_streams, gfp_t mem_flags) { -@@ -3277,7 +3277,7 @@ cleanup: +@@ -3316,7 +3316,7 @@ cleanup: * Modify the endpoint context state, submit a configure endpoint command, * and free all endpoint rings for streams if that completes successfully. */ @@ -153,7 +153,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_host_endpoint **eps, unsigned int num_eps, gfp_t mem_flags) { -@@ -3409,7 +3409,8 @@ void xhci_free_device_endpoint_resources +@@ -3448,7 +3448,8 @@ void xhci_free_device_endpoint_resources * re-initialization during S3/S4. In this case, call xhci_alloc_dev() to * re-allocate the device. */ @@ -163,7 +163,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { int ret, i; unsigned long flags; -@@ -3574,7 +3575,7 @@ command_cleanup: +@@ -3613,7 +3614,7 @@ command_cleanup: * disconnected, and all traffic has been stopped and the endpoints have been * disabled. Free any HC data structures associated with that device. */ @@ -172,7 +172,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_virt_device *virt_dev; -@@ -3963,12 +3964,12 @@ out: +@@ -4002,12 +4003,12 @@ out: return ret; } @@ -187,7 +187,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { return xhci_setup_device(hcd, udev, SETUP_CONTEXT_ONLY); } -@@ -4125,7 +4126,7 @@ static int xhci_calculate_usb2_hw_lpm_pa +@@ -4164,7 +4165,7 @@ static int xhci_calculate_usb2_hw_lpm_pa return PORT_BESLD(besld) | PORT_L1_TIMEOUT(l1) | PORT_HIRDM(hirdm); } @@ -196,7 +196,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_device *udev, int enable) { struct xhci_hcd *xhci = hcd_to_xhci(hcd); -@@ -4249,7 +4250,7 @@ static int xhci_check_usb2_port_capabili +@@ -4288,7 +4289,7 @@ static int xhci_check_usb2_port_capabili return 0; } @@ -205,7 +205,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { struct xhci_hcd *xhci = hcd_to_xhci(hcd); int portnum = udev->portnum - 1; -@@ -4658,7 +4659,7 @@ static int calculate_max_exit_latency(st +@@ -4697,7 +4698,7 @@ static int calculate_max_exit_latency(st } /* Returns the USB3 hub-encoded value for the U1/U2 timeout. */ @@ -214,7 +214,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_device *udev, enum usb3_link_state state) { struct xhci_hcd *xhci; -@@ -4689,7 +4690,7 @@ int xhci_enable_usb3_lpm_timeout(struct +@@ -4728,7 +4729,7 @@ int xhci_enable_usb3_lpm_timeout(struct return hub_encoded_timeout; } @@ -223,7 +223,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_device *udev, enum usb3_link_state state) { struct xhci_hcd *xhci; -@@ -4705,24 +4706,24 @@ int xhci_disable_usb3_lpm_timeout(struct +@@ -4744,24 +4745,24 @@ int xhci_disable_usb3_lpm_timeout(struct } #else /* CONFIG_PM */ @@ -252,7 +252,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_device *udev, enum usb3_link_state state) { return 0; -@@ -4734,7 +4735,7 @@ int xhci_disable_usb3_lpm_timeout(struct +@@ -4773,7 +4774,7 @@ int xhci_disable_usb3_lpm_timeout(struct /* Once a hub descriptor is fetched for a device, we need to update the xHC's * internal data structures for the device. */ @@ -261,7 +261,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct usb_tt *tt, gfp_t mem_flags) { struct xhci_hcd *xhci = hcd_to_xhci(hcd); -@@ -4840,7 +4841,7 @@ int xhci_update_hub_device(struct usb_hc +@@ -4879,7 +4880,7 @@ int xhci_update_hub_device(struct usb_hc return ret; } @@ -272,7 +272,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* EHCI mods by the periodic size. Why? */ --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1949,16 +1949,8 @@ void xhci_copy_ep0_dequeue_into_input_ct +@@ -1953,16 +1953,8 @@ void xhci_copy_ep0_dequeue_into_input_ct struct usb_device *udev); unsigned int xhci_get_endpoint_index(struct usb_endpoint_descriptor *desc); unsigned int xhci_get_endpoint_address(unsigned int ep_index); @@ -289,7 +289,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> void xhci_update_tt_active_eps(struct xhci_hcd *xhci, struct xhci_virt_device *virt_dev, int old_active_eps); -@@ -2017,10 +2009,7 @@ void xhci_quiesce(struct xhci_hcd *xhci) +@@ -2021,10 +2013,7 @@ void xhci_quiesce(struct xhci_hcd *xhci) int xhci_halt(struct xhci_hcd *xhci); int xhci_start(struct xhci_hcd *xhci); int xhci_reset(struct xhci_hcd *xhci); @@ -300,7 +300,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks); void xhci_init_driver(struct hc_driver *drv, const struct xhci_driver_overrides *over); -@@ -2035,36 +2024,13 @@ int xhci_resume(struct xhci_hcd *xhci, b +@@ -2039,36 +2028,13 @@ int xhci_resume(struct xhci_hcd *xhci, b #define xhci_resume NULL #endif @@ -337,7 +337,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* xHCI ring, segment, TRB, and TD functions */ dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb); -@@ -2108,9 +2074,6 @@ void xhci_queue_new_dequeue_state(struct +@@ -2112,9 +2078,6 @@ void xhci_queue_new_dequeue_state(struct struct xhci_dequeue_state *deq_state); void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci, unsigned int ep_index, struct xhci_td *td); @@ -347,7 +347,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> void xhci_stop_endpoint_command_watchdog(unsigned long arg); void xhci_handle_command_timeout(struct work_struct *work); -@@ -2121,10 +2084,6 @@ void xhci_cleanup_command_queue(struct x +@@ -2125,10 +2088,6 @@ void xhci_cleanup_command_queue(struct x /* xHCI roothub code */ void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array, int port_id, u32 link_state); diff --git a/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch b/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch index 7e355af88e6604..a55444046ef494 100644 --- a/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch +++ b/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch @@ -34,7 +34,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> for (i = LAST_EP_INDEX; i > 0; i--) { --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2634,7 +2634,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2636,7 +2636,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, return 0; fail: @@ -85,7 +85,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_queue_vendor_command(xhci, command, 0, 0, 0, TRB_TYPE(TRB_NEC_GET_FW)); } -@@ -3147,10 +3149,9 @@ static int xhci_alloc_streams(struct usb +@@ -3186,10 +3188,9 @@ static int xhci_alloc_streams(struct usb } config_cmd = xhci_alloc_command(xhci, true, true, mem_flags); @@ -98,7 +98,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ctrl_ctx = xhci_get_input_control_ctx(config_cmd->in_ctx); if (!ctrl_ctx) { xhci_warn(xhci, "%s: Could not get input context, bad type.\n", -@@ -4756,11 +4757,11 @@ static int xhci_update_hub_device(struct +@@ -4795,11 +4796,11 @@ static int xhci_update_hub_device(struct xhci_warn(xhci, "Cannot update hub desc for unknown device.\n"); return -EINVAL; } diff --git a/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch b/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch index bf18fa9b2a334f..f3d78e9cca88fc 100644 --- a/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch +++ b/patches.renesas/0192-usb-host-xhci-change-pre-increments-to-post-incremen.patch @@ -121,7 +121,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (dev->eps[i].ring) xhci_ring_free(xhci, dev->eps[i].ring); if (dev->eps[i].stream_info) -@@ -1613,7 +1613,7 @@ void xhci_update_bw_info(struct xhci_hcd +@@ -1615,7 +1615,7 @@ void xhci_update_bw_info(struct xhci_hcd unsigned int ep_type; int i; @@ -130,7 +130,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> bw_info = &virt_dev->eps[i].bw_info; /* We can't tell what endpoint type is being dropped, but -@@ -2598,9 +2598,9 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2600,9 +2600,9 @@ int xhci_mem_init(struct xhci_hcd *xhci, * something other than the default (~1ms minimum between interrupts). * See section 5.5.1.2. */ @@ -153,7 +153,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci->bus_state[i].port_c_suspend = 0; xhci->bus_state[i].suspended_ports = 0; xhci->bus_state[i].resuming_ports = 0; -@@ -1814,7 +1814,7 @@ static void xhci_zero_in_ctx(struct xhci +@@ -1853,7 +1853,7 @@ static void xhci_zero_in_ctx(struct xhci slot_ctx->dev_info &= cpu_to_le32(~LAST_CTX_MASK); /* Endpoint 0 is always valid */ slot_ctx->dev_info |= cpu_to_le32(LAST_CTX(1)); @@ -162,7 +162,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ep_ctx = xhci_get_ep_ctx(xhci, virt_dev->in_ctx, i); ep_ctx->ep_info = 0; ep_ctx->ep_info2 = 0; -@@ -2786,7 +2786,7 @@ int xhci_check_bandwidth(struct usb_hcd +@@ -2825,7 +2825,7 @@ int xhci_check_bandwidth(struct usb_hcd LAST_CTX_TO_EP_NUM(le32_to_cpu(slot_ctx->dev_info))); /* Free any rings that were dropped, but not changed. */ @@ -171,7 +171,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if ((le32_to_cpu(ctrl_ctx->drop_flags) & (1 << (i + 1))) && !(le32_to_cpu(ctrl_ctx->add_flags) & (1 << (i + 1)))) { xhci_free_or_cache_endpoint_ring(xhci, virt_dev, i); -@@ -2798,7 +2798,7 @@ int xhci_check_bandwidth(struct usb_hcd +@@ -2837,7 +2837,7 @@ int xhci_check_bandwidth(struct usb_hcd * Install any rings for completely new endpoints or changed endpoints, * and free or cache any old rings from changed endpoints. */ @@ -180,7 +180,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!virt_dev->eps[i].new_ring) continue; /* Only cache or free the old ring if it exists. -@@ -2832,7 +2832,7 @@ void xhci_reset_bandwidth(struct usb_hcd +@@ -2871,7 +2871,7 @@ void xhci_reset_bandwidth(struct usb_hcd xhci_dbg(xhci, "%s called for udev %p\n", __func__, udev); virt_dev = xhci->devs[udev->slot_id]; /* Free any rings allocated for added endpoints */ @@ -189,7 +189,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (virt_dev->eps[i].new_ring) { xhci_ring_free(xhci, virt_dev->eps[i].new_ring); virt_dev->eps[i].new_ring = NULL; -@@ -3538,7 +3538,7 @@ int xhci_discover_or_reset_device(struct +@@ -3577,7 +3577,7 @@ int xhci_discover_or_reset_device(struct /* Everything but endpoint 0 is disabled, so free or cache the rings. */ last_freed_endpoint = 1; @@ -198,7 +198,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct xhci_virt_ep *ep = &virt_dev->eps[i]; if (ep->ep_state & EP_HAS_STREAMS) { -@@ -3614,7 +3614,7 @@ void xhci_free_dev(struct usb_hcd *hcd, +@@ -3653,7 +3653,7 @@ void xhci_free_dev(struct usb_hcd *hcd, virt_dev = xhci->devs[udev->slot_id]; /* Stop any wayward timer functions (which may grab the lock) */ diff --git a/patches.renesas/0192-usb-xhci-remove-enq_updates-and-deq_updates-from-rin.patch b/patches.renesas/0192-usb-xhci-remove-enq_updates-and-deq_updates-from-rin.patch index 433ba580902f98..5e2a1e78fdfbd0 100644 --- a/patches.renesas/0192-usb-xhci-remove-enq_updates-and-deq_updates-from-rin.patch +++ b/patches.renesas/0192-usb-xhci-remove-enq_updates-and-deq_updates-from-rin.patch @@ -83,7 +83,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1566,10 +1566,8 @@ struct xhci_ring { +@@ -1570,10 +1570,8 @@ struct xhci_ring { struct xhci_segment *last_seg; union xhci_trb *enqueue; struct xhci_segment *enq_seg; diff --git a/patches.renesas/0193-usb-xhci-remove-ring-debugging-code.patch b/patches.renesas/0193-usb-xhci-remove-ring-debugging-code.patch index 771c667b964ec8..d89f37f56ea375 100644 --- a/patches.renesas/0193-usb-xhci-remove-ring-debugging-code.patch +++ b/patches.renesas/0193-usb-xhci-remove-ring-debugging-code.patch @@ -131,7 +131,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_dbg_trace(xhci, trace_xhci_dbg_init, --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1926,11 +1926,8 @@ void xhci_dbg_regs(struct xhci_hcd *xhci +@@ -1930,11 +1930,8 @@ void xhci_dbg_regs(struct xhci_hcd *xhci void xhci_print_run_regs(struct xhci_hcd *xhci); void xhci_print_trb_offsets(struct xhci_hcd *xhci, union xhci_trb *trb); void xhci_debug_trb(struct xhci_hcd *xhci, union xhci_trb *trb); diff --git a/patches.renesas/0194-usb-host-xhci-rename-completion-codes-to-match-spec.patch b/patches.renesas/0194-usb-host-xhci-rename-completion-codes-to-match-spec.patch index 5175106be4ea3a..ea5259544f05ec 100644 --- a/patches.renesas/0194-usb-host-xhci-rename-completion-codes-to-match-spec.patch +++ b/patches.renesas/0194-usb-host-xhci-rename-completion-codes-to-match-spec.patch @@ -400,7 +400,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> * Do not update event ring dequeue pointer if we're in a loop --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1829,32 +1829,32 @@ static int xhci_configure_endpoint_resul +@@ -1868,32 +1868,32 @@ static int xhci_configure_endpoint_resul int ret; switch (*cmd_status) { @@ -440,7 +440,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> dev_warn(&udev->dev, "ERROR: Incompatible device for endpoint configure command.\n"); ret = -ENODEV; -@@ -1880,33 +1880,33 @@ static int xhci_evaluate_context_result( +@@ -1919,33 +1919,33 @@ static int xhci_evaluate_context_result( struct xhci_virt_device *virt_dev = xhci->devs[udev->slot_id]; switch (*cmd_status) { @@ -481,7 +481,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Max Exit Latency too large error */ dev_warn(&udev->dev, "WARN: Max Exit Latency too large\n"); ret = -EINVAL; -@@ -3502,13 +3502,13 @@ int xhci_discover_or_reset_device(struct +@@ -3541,13 +3541,13 @@ int xhci_discover_or_reset_device(struct */ ret = reset_device_cmd->status; switch (ret) { @@ -499,7 +499,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_dbg(xhci, "Can't reset device (slot ID %u) in %s state\n", slot_id, xhci_get_slot_state(xhci, virt_dev->out_ctx)); -@@ -3868,22 +3868,22 @@ static int xhci_setup_device(struct usb_ +@@ -3907,22 +3907,22 @@ static int xhci_setup_device(struct usb_ * command on a timeout. */ switch (command->status) { @@ -530,7 +530,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ret = -ENODEV; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1060,76 +1060,42 @@ struct xhci_transfer_event { +@@ -1064,76 +1064,42 @@ struct xhci_transfer_event { /* Completion Code - only applicable for some types of TRBs */ #define COMP_CODE_MASK (0xff << 24) #define GET_COMP_CODE(p) (((p) & COMP_CODE_MASK) >> 24) diff --git a/patches.renesas/0194-usb-xhci-remove-xhci_debug_trb.patch b/patches.renesas/0194-usb-xhci-remove-xhci_debug_trb.patch index 99fa7b3fae0d21..8971e8e9c5b06a 100644 --- a/patches.renesas/0194-usb-xhci-remove-xhci_debug_trb.patch +++ b/patches.renesas/0194-usb-xhci-remove-xhci_debug_trb.patch @@ -99,7 +99,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ep->skip = false; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1924,8 +1924,6 @@ void xhci_print_ir_set(struct xhci_hcd * +@@ -1928,8 +1928,6 @@ void xhci_print_ir_set(struct xhci_hcd * void xhci_print_registers(struct xhci_hcd *xhci); void xhci_dbg_regs(struct xhci_hcd *xhci); void xhci_print_run_regs(struct xhci_hcd *xhci); diff --git a/patches.renesas/0195-usb-xhci-remove-xhci_dbg_ctx.patch b/patches.renesas/0195-usb-xhci-remove-xhci_dbg_ctx.patch index 636a6ab27b0c55..9b7e41eaadfadb 100644 --- a/patches.renesas/0195-usb-xhci-remove-xhci_dbg_ctx.patch +++ b/patches.renesas/0195-usb-xhci-remove-xhci_dbg_ctx.patch @@ -179,7 +179,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> { --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1308,11 +1308,6 @@ static int xhci_check_maxpacket(struct x +@@ -1347,11 +1347,6 @@ static int xhci_check_maxpacket(struct x ctrl_ctx->add_flags = cpu_to_le32(EP0_FLAG); ctrl_ctx->drop_flags = 0; @@ -191,7 +191,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ret = xhci_configure_endpoint(xhci, urb->dev, command, true, false); -@@ -1860,7 +1855,6 @@ static int xhci_evaluate_context_result( +@@ -1899,7 +1894,6 @@ static int xhci_evaluate_context_result( struct usb_device *udev, u32 *cmd_status) { int ret; @@ -199,7 +199,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> switch (*cmd_status) { case COMP_COMMAND_ABORTED: -@@ -1881,7 +1875,6 @@ static int xhci_evaluate_context_result( +@@ -1920,7 +1914,6 @@ static int xhci_evaluate_context_result( case COMP_CONTEXT_STATE_ERROR: dev_warn(&udev->dev, "WARN: invalid context state for evaluate context command.\n"); @@ -207,7 +207,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ret = -EINVAL; break; case COMP_INCOMPATIBLE_DEVICE_ERROR: -@@ -2760,9 +2753,6 @@ static int xhci_check_bandwidth(struct u +@@ -2799,9 +2792,6 @@ static int xhci_check_bandwidth(struct u break; } } @@ -217,7 +217,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ret = xhci_configure_endpoint(xhci, udev, command, false, false); -@@ -2770,10 +2760,6 @@ static int xhci_check_bandwidth(struct u +@@ -2809,10 +2799,6 @@ static int xhci_check_bandwidth(struct u /* Callee should call reset_bandwidth() */ goto command_cleanup; @@ -228,7 +228,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Free any rings that were dropped, but not changed. */ for (i = 1; i < 31; i++) { if ((le32_to_cpu(ctrl_ctx->drop_flags) & (1 << (i + 1))) && -@@ -2840,9 +2826,6 @@ static void xhci_setup_input_ctx_for_con +@@ -2879,9 +2865,6 @@ static void xhci_setup_input_ctx_for_con ctrl_ctx->drop_flags = cpu_to_le32(drop_flags); xhci_slot_copy(xhci, in_ctx, out_ctx); ctrl_ctx->add_flags |= cpu_to_le32(SLOT_FLAG); @@ -238,7 +238,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } static void xhci_setup_input_ctx_for_quirk(struct xhci_hcd *xhci, -@@ -3555,9 +3538,6 @@ static int xhci_discover_or_reset_device +@@ -3594,9 +3577,6 @@ static int xhci_discover_or_reset_device } /* If necessary, update the number of active TTs on this root port */ xhci_update_tt_active_eps(xhci, virt_dev, old_active_eps); @@ -248,7 +248,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> ret = 0; command_cleanup: -@@ -3857,8 +3837,6 @@ static int xhci_setup_device(struct usb_ +@@ -3896,8 +3876,6 @@ static int xhci_setup_device(struct usb_ ctrl_ctx->add_flags = cpu_to_le32(SLOT_FLAG | EP0_FLAG); ctrl_ctx->drop_flags = 0; @@ -257,7 +257,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> trace_xhci_address_ctx(xhci, virt_dev->in_ctx, le32_to_cpu(slot_ctx->dev_info) >> 27); -@@ -3911,8 +3889,6 @@ static int xhci_setup_device(struct usb_ +@@ -3950,8 +3928,6 @@ static int xhci_setup_device(struct usb_ xhci_err(xhci, "ERROR: unexpected setup %s command completion code 0x%x.\n", act, command->status); @@ -266,7 +266,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> trace_xhci_address_ctx(xhci, virt_dev->out_ctx, 1); ret = -EINVAL; break; -@@ -3931,12 +3907,8 @@ static int xhci_setup_device(struct usb_ +@@ -3970,12 +3946,8 @@ static int xhci_setup_device(struct usb_ xhci_dbg_trace(xhci, trace_xhci_dbg_address, "Output Context DMA address = %#08llx", (unsigned long long)virt_dev->out_ctx->dma); @@ -279,7 +279,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* * USB core uses address 1 for the roothubs, so we add one to the * address given back to us by the HC. -@@ -4041,14 +4013,10 @@ static int __maybe_unused xhci_change_ma +@@ -4080,14 +4052,10 @@ static int __maybe_unused xhci_change_ma xhci_dbg_trace(xhci, trace_xhci_dbg_context_change, "Set up evaluate context for LPM MEL change."); @@ -294,7 +294,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!ret) { spin_lock_irqsave(&xhci->lock, flags); -@@ -4816,8 +4784,6 @@ static int xhci_update_hub_device(struct +@@ -4855,8 +4823,6 @@ static int xhci_update_hub_device(struct xhci_dbg(xhci, "Set up %s for hub device.\n", (xhci->hci_version > 0x95) ? "configure endpoint" : "evaluate context"); @@ -303,7 +303,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Issue and wait for the configure endpoint or * evaluate context command. -@@ -4829,9 +4795,6 @@ static int xhci_update_hub_device(struct +@@ -4868,9 +4834,6 @@ static int xhci_update_hub_device(struct ret = xhci_configure_endpoint(xhci, hdev, config_cmd, true, false); @@ -315,7 +315,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1926,7 +1926,6 @@ void xhci_dbg_regs(struct xhci_hcd *xhci +@@ -1930,7 +1930,6 @@ void xhci_dbg_regs(struct xhci_hcd *xhci void xhci_print_run_regs(struct xhci_hcd *xhci); void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst); void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci); diff --git a/patches.renesas/0196-usb-xhci-fix-link-trb-decoding.patch b/patches.renesas/0196-usb-xhci-fix-link-trb-decoding.patch index 18298f856d2444..27fe92b10411e1 100644 --- a/patches.renesas/0196-usb-xhci-fix-link-trb-decoding.patch +++ b/patches.renesas/0196-usb-xhci-fix-link-trb-decoding.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2138,14 +2138,12 @@ static inline const char *xhci_decode_tr +@@ -2142,14 +2142,12 @@ static inline const char *xhci_decode_tr switch (type) { case TRB_LINK: sprintf(str, diff --git a/patches.renesas/0197-clk-renesas-cpg-mssr-Add-R8A7743-support.patch b/patches.renesas/0197-clk-renesas-cpg-mssr-Add-R8A7743-support.patch index 506abe9c067c0f..2a6be7272497d3 100644 --- a/patches.renesas/0197-clk-renesas-cpg-mssr-Add-R8A7743-support.patch +++ b/patches.renesas/0197-clk-renesas-cpg-mssr-Add-R8A7743-support.patch @@ -340,7 +340,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +}; --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c -@@ -502,6 +502,12 @@ static int __init cpg_mssr_add_clk_domai +@@ -503,6 +503,12 @@ static int __init cpg_mssr_add_clk_domai } static const struct of_device_id cpg_mssr_match[] = { diff --git a/patches.renesas/0197-usb-xhci-refine-xhci_decode_trb.patch b/patches.renesas/0197-usb-xhci-refine-xhci_decode_trb.patch index c6f736b80b830c..18ecee26655270 100644 --- a/patches.renesas/0197-usb-xhci-refine-xhci_decode_trb.patch +++ b/patches.renesas/0197-usb-xhci-refine-xhci_decode_trb.patch @@ -17,7 +17,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2140,7 +2140,7 @@ static inline const char *xhci_decode_tr +@@ -2144,7 +2144,7 @@ static inline const char *xhci_decode_tr sprintf(str, "LINK %08x%08x intr %d type '%s' flags %c:%c:%c:%c", field1, field0, GET_INTR_TARGET(field2), @@ -26,7 +26,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field3 & TRB_IOC ? 'I' : 'i', field3 & TRB_CHAIN ? 'C' : 'c', field3 & TRB_TC ? 'T' : 't', -@@ -2161,7 +2161,7 @@ static inline const char *xhci_decode_tr +@@ -2165,7 +2165,7 @@ static inline const char *xhci_decode_tr EVENT_TRB_LEN(field2), TRB_TO_SLOT_ID(field3), /* Macro decrements 1, maybe it shouldn't?!? */ TRB_TO_EP_INDEX(field3) + 1, @@ -35,7 +35,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field3 & EVENT_DATA ? 'E' : 'e', field3 & TRB_CYCLE ? 'C' : 'c'); -@@ -2178,7 +2178,7 @@ static inline const char *xhci_decode_tr +@@ -2182,7 +2182,7 @@ static inline const char *xhci_decode_tr (field1 & 0xff0000) >> 16, TRB_LEN(field2), GET_TD_SIZE(field2), GET_INTR_TARGET(field2), @@ -44,7 +44,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field3 & TRB_IDT ? 'I' : 'i', field3 & TRB_IOC ? 'I' : 'i', field3 & TRB_CYCLE ? 'C' : 'c'); -@@ -2187,7 +2187,7 @@ static inline const char *xhci_decode_tr +@@ -2191,7 +2191,7 @@ static inline const char *xhci_decode_tr sprintf(str, "Buffer %08x%08x length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c:%c:%c:%c", field1, field0, TRB_LEN(field2), GET_TD_SIZE(field2), GET_INTR_TARGET(field2), @@ -53,7 +53,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field3 & TRB_IDT ? 'I' : 'i', field3 & TRB_IOC ? 'I' : 'i', field3 & TRB_CHAIN ? 'C' : 'c', -@@ -2200,7 +2200,7 @@ static inline const char *xhci_decode_tr +@@ -2204,7 +2204,7 @@ static inline const char *xhci_decode_tr sprintf(str, "Buffer %08x%08x length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c", field1, field0, TRB_LEN(field2), GET_TD_SIZE(field2), GET_INTR_TARGET(field2), @@ -62,7 +62,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field3 & TRB_IOC ? 'I' : 'i', field3 & TRB_CHAIN ? 'C' : 'c', field3 & TRB_ENT ? 'E' : 'e', -@@ -2214,7 +2214,7 @@ static inline const char *xhci_decode_tr +@@ -2218,7 +2218,7 @@ static inline const char *xhci_decode_tr "Buffer %08x%08x length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c:%c:%c:%c:%c", field1, field0, TRB_LEN(field2), GET_TD_SIZE(field2), GET_INTR_TARGET(field2), @@ -71,7 +71,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field3 & TRB_BEI ? 'B' : 'b', field3 & TRB_IDT ? 'I' : 'i', field3 & TRB_IOC ? 'I' : 'i', -@@ -2229,21 +2229,21 @@ static inline const char *xhci_decode_tr +@@ -2233,21 +2233,21 @@ static inline const char *xhci_decode_tr case TRB_ENABLE_SLOT: sprintf(str, "%s: flags %c", @@ -96,7 +96,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field1, field0, TRB_TO_SLOT_ID(field3), field3 & TRB_BSR ? 'B' : 'b', -@@ -2252,7 +2252,7 @@ static inline const char *xhci_decode_tr +@@ -2256,7 +2256,7 @@ static inline const char *xhci_decode_tr case TRB_CONFIG_EP: sprintf(str, "%s: ctx %08x%08x slot %d flags %c:%c", @@ -105,7 +105,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field1, field0, TRB_TO_SLOT_ID(field3), field3 & TRB_DC ? 'D' : 'd', -@@ -2261,7 +2261,7 @@ static inline const char *xhci_decode_tr +@@ -2265,7 +2265,7 @@ static inline const char *xhci_decode_tr case TRB_EVAL_CONTEXT: sprintf(str, "%s: ctx %08x%08x slot %d flags %c", @@ -114,7 +114,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field1, field0, TRB_TO_SLOT_ID(field3), field3 & TRB_CYCLE ? 'C' : 'c'); -@@ -2269,7 +2269,7 @@ static inline const char *xhci_decode_tr +@@ -2273,7 +2273,7 @@ static inline const char *xhci_decode_tr case TRB_RESET_EP: sprintf(str, "%s: ctx %08x%08x slot %d ep %d flags %c", @@ -123,7 +123,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field1, field0, TRB_TO_SLOT_ID(field3), /* Macro decrements 1, maybe it shouldn't?!? */ -@@ -2279,7 +2279,7 @@ static inline const char *xhci_decode_tr +@@ -2283,7 +2283,7 @@ static inline const char *xhci_decode_tr case TRB_STOP_RING: sprintf(str, "%s: slot %d sp %d ep %d flags %c", @@ -132,7 +132,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> TRB_TO_SLOT_ID(field3), TRB_TO_SUSPEND_PORT(field3), /* Macro decrements 1, maybe it shouldn't?!? */ -@@ -2289,7 +2289,7 @@ static inline const char *xhci_decode_tr +@@ -2293,7 +2293,7 @@ static inline const char *xhci_decode_tr case TRB_SET_DEQ: sprintf(str, "%s: deq %08x%08x stream %d slot %d ep %d flags %c", @@ -141,7 +141,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field1, field0, TRB_TO_STREAM_ID(field2), TRB_TO_SLOT_ID(field3), -@@ -2300,14 +2300,14 @@ static inline const char *xhci_decode_tr +@@ -2304,14 +2304,14 @@ static inline const char *xhci_decode_tr case TRB_RESET_DEV: sprintf(str, "%s: slot %d flags %c", @@ -158,7 +158,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field1, field0, TRB_TO_VF_INTR_TARGET(field2), TRB_TO_VF_ID(field3), -@@ -2316,14 +2316,14 @@ static inline const char *xhci_decode_tr +@@ -2320,14 +2320,14 @@ static inline const char *xhci_decode_tr case TRB_SET_LT: sprintf(str, "%s: belt %d flags %c", @@ -175,7 +175,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field1, field0, TRB_TO_SLOT_ID(field3), TRB_TO_DEV_SPEED(field3), -@@ -2332,7 +2332,7 @@ static inline const char *xhci_decode_tr +@@ -2336,7 +2336,7 @@ static inline const char *xhci_decode_tr case TRB_FORCE_HEADER: sprintf(str, "%s: info %08x%08x%08x pkt type %d roothub port %d flags %c", @@ -184,7 +184,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> field2, field1, field0 & 0xffffffe0, TRB_TO_PACKET_TYPE(field0), TRB_TO_ROOTHUB_PORT(field3), -@@ -2341,7 +2341,7 @@ static inline const char *xhci_decode_tr +@@ -2345,7 +2345,7 @@ static inline const char *xhci_decode_tr default: sprintf(str, "type '%s' -> raw %08x %08x %08x %08x", diff --git a/patches.renesas/0198-clk-renesas-cpg-mssr-Add-R8A7745-support.patch b/patches.renesas/0198-clk-renesas-cpg-mssr-Add-R8A7745-support.patch index 440e796b001dbc..c522847f46e30a 100644 --- a/patches.renesas/0198-clk-renesas-cpg-mssr-Add-R8A7745-support.patch +++ b/patches.renesas/0198-clk-renesas-cpg-mssr-Add-R8A7745-support.patch @@ -331,7 +331,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> +}; --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c -@@ -508,6 +508,12 @@ static const struct of_device_id cpg_mss +@@ -509,6 +509,12 @@ static const struct of_device_id cpg_mss .data = &r8a7743_cpg_mssr_info, }, #endif diff --git a/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch b/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch index e247431ecd8c18..b21095dc9d52e1 100644 --- a/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch +++ b/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2449,7 +2449,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2451,7 +2451,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, writel(val, &xhci->op_regs->config_reg); /* diff --git a/patches.renesas/0205-usb-host-xhci-combine-event-TRB-completion-debugging.patch b/patches.renesas/0205-usb-host-xhci-combine-event-TRB-completion-debugging.patch index ef551b18f24b4f..f6690e0fe25fde 100644 --- a/patches.renesas/0205-usb-host-xhci-combine-event-TRB-completion-debugging.patch +++ b/patches.renesas/0205-usb-host-xhci-combine-event-TRB-completion-debugging.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1097,6 +1097,86 @@ struct xhci_transfer_event { +@@ -1101,6 +1101,86 @@ struct xhci_transfer_event { #define COMP_SECONDARY_BANDWIDTH_ERROR 35 #define COMP_SPLIT_TRANSACTION_ERROR 36 diff --git a/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch b/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch index 94e09440b5501a..d84584080ffca1 100644 --- a/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch +++ b/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1736,36 +1736,27 @@ static int scratchpad_alloc(struct xhci_ +@@ -1738,36 +1738,27 @@ static int scratchpad_alloc(struct xhci_ if (!xhci->scratchpad->sp_buffers) goto fail_sp3; @@ -58,7 +58,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> kfree(xhci->scratchpad->sp_buffers); fail_sp3: -@@ -1795,9 +1786,8 @@ static void scratchpad_free(struct xhci_ +@@ -1797,9 +1788,8 @@ static void scratchpad_free(struct xhci_ for (i = 0; i < num_sp; i++) { dma_free_coherent(dev, xhci->page_size, xhci->scratchpad->sp_buffers[i], @@ -71,7 +71,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci->scratchpad->sp_array, --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1606,7 +1606,6 @@ struct xhci_scratchpad { +@@ -1610,7 +1610,6 @@ struct xhci_scratchpad { u64 *sp_array; dma_addr_t sp_dma; void **sp_buffers; diff --git a/patches.renesas/0206-usb-host-xhci-make-a-generic-TRB-tracer.patch b/patches.renesas/0206-usb-host-xhci-make-a-generic-TRB-tracer.patch index ee31d23f974c36..d238d8798cd5fe 100644 --- a/patches.renesas/0206-usb-host-xhci-make-a-generic-TRB-tracer.patch +++ b/patches.renesas/0206-usb-host-xhci-make-a-generic-TRB-tracer.patch @@ -144,7 +144,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #endif /* __XHCI_TRACE_H */ --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1199,6 +1199,27 @@ struct xhci_event_cmd { +@@ -1203,6 +1203,27 @@ struct xhci_event_cmd { /* Address device - disable SetAddress */ #define TRB_BSR (1<<9) @@ -172,7 +172,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> enum xhci_setup_dev { SETUP_CONTEXT_ONLY, SETUP_CONTEXT_ADDRESS, -@@ -1222,16 +1243,21 @@ enum xhci_setup_dev { +@@ -1226,16 +1247,21 @@ enum xhci_setup_dev { #define STREAM_ID_FOR_TRB(p) ((((p)) & 0xffff) << 16) #define SCT_FOR_TRB(p) (((p) << 1) & 0x7) @@ -194,7 +194,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* xhci 1.1 uses the TD_SIZE field for TBC if Extended TBC is enabled (ETE) */ #define TRB_TD_SIZE_TBC(p) (min((p), (u32)31) << 17) /* Interrupter Target - which MSI-X vector to target the completion event at */ -@@ -1359,6 +1385,80 @@ union xhci_trb { +@@ -1363,6 +1389,80 @@ union xhci_trb { /* Get NEC firmware revision. */ #define TRB_NEC_GET_FW 49 @@ -275,7 +275,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #define TRB_TYPE_LINK(x) (((x) & TRB_TYPE_BITMASK) == TRB_TYPE(TRB_LINK)) /* Above, but for __le32 types -- can avoid work by swapping constants: */ #define TRB_TYPE_LINK_LE32(x) (((x) & cpu_to_le32(TRB_TYPE_BITMASK)) == \ -@@ -1435,6 +1535,28 @@ enum xhci_ring_type { +@@ -1439,6 +1539,28 @@ enum xhci_ring_type { TYPE_EVENT, }; @@ -304,7 +304,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct xhci_ring { struct xhci_segment *first_seg; struct xhci_segment *last_seg; -@@ -2034,4 +2156,211 @@ static inline struct xhci_ring *xhci_urb +@@ -2038,4 +2160,211 @@ static inline struct xhci_ring *xhci_urb urb->stream_id); } diff --git a/patches.renesas/0206-usb-host-xhci-remove-ifdef-around-PM-functions.patch b/patches.renesas/0206-usb-host-xhci-remove-ifdef-around-PM-functions.patch index 60d79cc3409919..ab6d1d23e5279f 100644 --- a/patches.renesas/0206-usb-host-xhci-remove-ifdef-around-PM-functions.patch +++ b/patches.renesas/0206-usb-host-xhci-remove-ifdef-around-PM-functions.patch @@ -74,7 +74,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume) --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -2007,13 +2007,8 @@ void xhci_init_driver(struct hc_driver * +@@ -2011,13 +2011,8 @@ void xhci_init_driver(struct hc_driver * int xhci_disable_slot(struct xhci_hcd *xhci, struct xhci_command *command, u32 slot_id); diff --git a/patches.renesas/0207-usb-host-xhci-add-urb_enqueue-dequeue-giveback-trace.patch b/patches.renesas/0207-usb-host-xhci-add-urb_enqueue-dequeue-giveback-trace.patch index 9994ecbe68cbd3..68ceb520382b17 100644 --- a/patches.renesas/0207-usb-host-xhci-add-urb_enqueue-dequeue-giveback-trace.patch +++ b/patches.renesas/0207-usb-host-xhci-add-urb_enqueue-dequeue-giveback-trace.patch @@ -109,7 +109,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* this part must be outside header guard */ --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1389,6 +1389,8 @@ int xhci_urb_enqueue(struct usb_hcd *hcd +@@ -1428,6 +1428,8 @@ int xhci_urb_enqueue(struct usb_hcd *hcd urb_priv->td_cnt = 0; urb->hcpriv = urb_priv; @@ -118,7 +118,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (usb_endpoint_xfer_control(&urb->ep->desc)) { /* Check to see if the max packet size for the default control * endpoint changed during FS device enumeration -@@ -1515,6 +1517,9 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1554,6 +1556,9 @@ int xhci_urb_dequeue(struct usb_hcd *hcd xhci = hcd_to_xhci(hcd); spin_lock_irqsave(&xhci->lock, flags); diff --git a/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch b/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch index 598f08c12474bd..7a4ea89259c878 100644 --- a/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch +++ b/patches.renesas/0208-usb-host-xhci-convert-several-if-to-a-single-switch-.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1429,14 +1429,16 @@ static u32 xhci_get_endpoint_type(struct +@@ -1431,14 +1431,16 @@ static u32 xhci_get_endpoint_type(struct in = usb_endpoint_dir_in(&ep->desc); diff --git a/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch b/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch index b753d37edd65ca..c62ac37a31fce5 100644 --- a/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch +++ b/patches.renesas/0209-usb-host-xhci-add-xhci_virt_device-tracer.patch @@ -42,7 +42,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci->dcbaa->dev_context_ptrs[slot_id] = 0; if (!dev) return; -@@ -1083,6 +1086,8 @@ int xhci_alloc_virt_device(struct xhci_h +@@ -1085,6 +1088,8 @@ int xhci_alloc_virt_device(struct xhci_h xhci->devs[slot_id] = dev; @@ -51,7 +51,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 1; fail: if (dev->eps[0].ring) -@@ -1264,6 +1269,8 @@ int xhci_setup_addressable_virt_dev(stru +@@ -1266,6 +1271,8 @@ int xhci_setup_addressable_virt_dev(stru ep0_ctx->deq = cpu_to_le64(dev->eps[0].ring->first_seg->dma | dev->eps[0].ring->cycle_state); @@ -128,7 +128,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> TP_ARGS(urb), --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -3854,6 +3854,7 @@ static int xhci_setup_device(struct usb_ +@@ -3893,6 +3893,7 @@ static int xhci_setup_device(struct usb_ le32_to_cpu(slot_ctx->dev_info) >> 27); spin_lock_irqsave(&xhci->lock, flags); diff --git a/patches.renesas/0210-xhci-rename-size-variable-to-num_tds.patch b/patches.renesas/0210-xhci-rename-size-variable-to-num_tds.patch index 60984594032cd5..173af3ed166e21 100644 --- a/patches.renesas/0210-xhci-rename-size-variable-to-num_tds.patch +++ b/patches.renesas/0210-xhci-rename-size-variable-to-num_tds.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1343,7 +1343,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd +@@ -1382,7 +1382,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd int ret = 0; unsigned int slot_id, ep_index; struct urb_priv *urb_priv; @@ -25,7 +25,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!urb || xhci_check_args(hcd, urb->dev, urb->ep, true, true, __func__) <= 0) -@@ -1360,32 +1360,32 @@ int xhci_urb_enqueue(struct usb_hcd *hcd +@@ -1399,32 +1399,32 @@ int xhci_urb_enqueue(struct usb_hcd *hcd } if (usb_endpoint_xfer_isoc(&urb->ep->desc)) diff --git a/patches.renesas/0211-xhci-Rename-variables-related-to-transfer-descritpor.patch b/patches.renesas/0211-xhci-Rename-variables-related-to-transfer-descritpor.patch index a2696d348b5877..f7779f4fc19c28 100644 --- a/patches.renesas/0211-xhci-Rename-variables-related-to-transfer-descritpor.patch +++ b/patches.renesas/0211-xhci-Rename-variables-related-to-transfer-descritpor.patch @@ -71,7 +71,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> td = urb_priv->td[0]; --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1385,8 +1385,8 @@ int xhci_urb_enqueue(struct usb_hcd *hcd +@@ -1424,8 +1424,8 @@ int xhci_urb_enqueue(struct usb_hcd *hcd buffer++; } @@ -82,7 +82,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> urb->hcpriv = urb_priv; trace_xhci_urb_enqueue(urb); -@@ -1529,8 +1529,8 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1568,8 +1568,8 @@ int xhci_urb_dequeue(struct usb_hcd *hcd xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, "HW died, freeing TD."); urb_priv = urb->hcpriv; @@ -93,7 +93,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i++) { td = urb_priv->td[i]; if (!list_empty(&td->td_list)) -@@ -1555,8 +1555,8 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1594,8 +1594,8 @@ int xhci_urb_dequeue(struct usb_hcd *hcd } urb_priv = urb->hcpriv; @@ -104,7 +104,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, "Cancel URB %p, dev %s, ep 0x%x, " "starting at offset 0x%llx", -@@ -1566,7 +1566,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1605,7 +1605,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd urb_priv->td[i]->start_seg, urb_priv->td[i]->first_trb)); @@ -115,7 +115,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1608,8 +1608,8 @@ struct xhci_scratchpad { +@@ -1612,8 +1612,8 @@ struct xhci_scratchpad { }; struct urb_priv { diff --git a/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch b/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch index 1934a1375e6a67..058c691b7291de 100644 --- a/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch +++ b/patches.renesas/0212-xhci-simplify-how-we-store-TDs-in-urb-private-data.patch @@ -32,7 +32,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1843,10 +1843,7 @@ struct xhci_command *xhci_alloc_command( +@@ -1845,10 +1845,7 @@ struct xhci_command *xhci_alloc_command( void xhci_urb_free_priv(struct urb_priv *urb_priv) { @@ -119,7 +119,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> usb_hcd_unlink_urb_from_ep(bus_to_hcd(urb->dev->bus), urb); --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1338,12 +1338,11 @@ command_cleanup: +@@ -1377,12 +1377,11 @@ command_cleanup: int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags) { struct xhci_hcd *xhci = hcd_to_xhci(hcd); @@ -133,7 +133,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!urb || xhci_check_args(hcd, urb->dev, urb->ep, true, true, __func__) <= 0) -@@ -1370,21 +1369,10 @@ int xhci_urb_enqueue(struct usb_hcd *hcd +@@ -1409,21 +1408,10 @@ int xhci_urb_enqueue(struct usb_hcd *hcd num_tds = 1; urb_priv = kzalloc(sizeof(struct urb_priv) + @@ -156,7 +156,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> urb_priv->num_tds = num_tds; urb_priv->num_tds_done = 0; urb->hcpriv = urb_priv; -@@ -1532,7 +1520,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1571,7 +1559,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd for (i = urb_priv->num_tds_done; i < urb_priv->num_tds && xhci->devs[urb->dev->slot_id]; i++) { @@ -165,7 +165,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!list_empty(&td->td_list)) list_del_init(&td->td_list); if (!list_empty(&td->cancelled_td_list)) -@@ -1563,11 +1551,11 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1602,11 +1590,11 @@ int xhci_urb_dequeue(struct usb_hcd *hcd urb, urb->dev->devpath, urb->ep->desc.bEndpointAddress, (unsigned long long) xhci_trb_virt_to_dma( @@ -182,7 +182,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1610,7 +1610,7 @@ struct xhci_scratchpad { +@@ -1614,7 +1614,7 @@ struct xhci_scratchpad { struct urb_priv { int num_tds; int num_tds_done; diff --git a/patches.renesas/0213-xhci-refactor-xhci_urb_enqueue.patch b/patches.renesas/0213-xhci-refactor-xhci_urb_enqueue.patch index 1589d15a9daaf7..847406fd5066df 100644 --- a/patches.renesas/0213-xhci-refactor-xhci_urb_enqueue.patch +++ b/patches.renesas/0213-xhci-refactor-xhci_urb_enqueue.patch @@ -15,7 +15,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1340,7 +1340,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd +@@ -1379,7 +1379,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd struct xhci_hcd *xhci = hcd_to_xhci(hcd); unsigned long flags; int ret = 0; @@ -24,7 +24,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> struct urb_priv *urb_priv; int num_tds; -@@ -1354,8 +1354,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd +@@ -1393,8 +1393,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd if (!HCD_HW_ACCESSIBLE(hcd)) { if (!in_interrupt()) xhci_dbg(xhci, "urb submitted during PCI suspend\n"); @@ -34,7 +34,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } if (usb_endpoint_xfer_isoc(&urb->ep->desc)) -@@ -1392,69 +1391,51 @@ int xhci_urb_enqueue(struct usb_hcd *hcd +@@ -1431,69 +1430,51 @@ int xhci_urb_enqueue(struct usb_hcd *hcd return ret; } } diff --git a/patches.renesas/0216-xhci-Manually-give-back-cancelled-URB-if-we-can-t-qu.patch b/patches.renesas/0216-xhci-Manually-give-back-cancelled-URB-if-we-can-t-qu.patch index abbcac71d67b98..c9df389c165e15 100644 --- a/patches.renesas/0216-xhci-Manually-give-back-cancelled-URB-if-we-can-t-qu.patch +++ b/patches.renesas/0216-xhci-Manually-give-back-cancelled-URB-if-we-can-t-qu.patch @@ -56,7 +56,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1483,6 +1483,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1522,6 +1522,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd struct xhci_ring *ep_ring; struct xhci_virt_ep *ep; struct xhci_command *command; @@ -64,7 +64,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci = hcd_to_xhci(hcd); spin_lock_irqsave(&xhci->lock, flags); -@@ -1491,15 +1492,27 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1530,15 +1531,27 @@ int xhci_urb_dequeue(struct usb_hcd *hcd /* Make sure the URB hasn't completed or been unlinked already */ ret = usb_hcd_check_unlink_urb(hcd, urb, status); @@ -95,7 +95,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i++) { td = &urb_priv->td[i]; if (!list_empty(&td->td_list)) -@@ -1507,23 +1520,9 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1546,23 +1559,9 @@ int xhci_urb_dequeue(struct usb_hcd *hcd if (!list_empty(&td->cancelled_td_list)) list_del_init(&td->cancelled_td_list); } @@ -120,7 +120,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> i = urb_priv->num_tds_done; if (i < urb_priv->num_tds) xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb, -@@ -1560,6 +1559,14 @@ int xhci_urb_dequeue(struct usb_hcd *hcd +@@ -1599,6 +1598,14 @@ int xhci_urb_dequeue(struct usb_hcd *hcd done: spin_unlock_irqrestore(&xhci->lock, flags); return ret; diff --git a/patches.renesas/0217-ravb-Add-tx-and-rx-clock-internal-delays-mode-of-APS.patch b/patches.renesas/0217-ravb-Add-tx-and-rx-clock-internal-delays-mode-of-APS.patch index 5cdd35eac5ace9..7e103f7ac35ef2 100644 --- a/patches.renesas/0217-ravb-Add-tx-and-rx-clock-internal-delays-mode-of-APS.patch +++ b/patches.renesas/0217-ravb-Add-tx-and-rx-clock-internal-delays-mode-of-APS.patch @@ -58,7 +58,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> RCR_EFFS = 0x00000001, --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c -@@ -1921,6 +1921,23 @@ static void ravb_set_config_mode(struct +@@ -1897,6 +1897,23 @@ static void ravb_set_config_mode(struct } } @@ -82,7 +82,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> static int ravb_probe(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; -@@ -2033,6 +2050,9 @@ static int ravb_probe(struct platform_de +@@ -2009,6 +2026,9 @@ static int ravb_probe(struct platform_de /* Request GTI loading */ ravb_modify(ndev, GCCR, GCCR_LTI, GCCR_LTI); @@ -92,7 +92,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Allocate descriptor base address table */ priv->desc_bat_size = sizeof(struct ravb_desc) * DBAT_ENTRY_NUM; priv->desc_bat = dma_alloc_coherent(ndev->dev.parent, priv->desc_bat_size, -@@ -2169,6 +2189,9 @@ static int __maybe_unused ravb_resume(st +@@ -2145,6 +2165,9 @@ static int __maybe_unused ravb_resume(st /* Request GTI loading */ ravb_modify(ndev, GCCR, GCCR_LTI, GCCR_LTI); diff --git a/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch b/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch index 0fd36cbdd1d447..7970e6a846a3ce 100644 --- a/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch +++ b/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch @@ -16,7 +16,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2325,10 +2325,11 @@ static int xhci_setup_port_arrays(struct +@@ -2327,10 +2327,11 @@ static int xhci_setup_port_arrays(struct /* Place limits on the number of roothub ports so that the hub * descriptors aren't longer than the USB core will allocate. */ diff --git a/patches.renesas/0218-ravb-Support-1Gbps-on-R-Car-H3-ES1.1-and-R-Car-M3-W.patch b/patches.renesas/0218-ravb-Support-1Gbps-on-R-Car-H3-ES1.1-and-R-Car-M3-W.patch index 005f0bf788f848..cd9baf12b5bea6 100644 --- a/patches.renesas/0218-ravb-Support-1Gbps-on-R-Car-H3-ES1.1-and-R-Car-M3-W.patch +++ b/patches.renesas/0218-ravb-Support-1Gbps-on-R-Car-H3-ES1.1-and-R-Car-M3-W.patch @@ -27,7 +27,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #include <asm/div64.h> -@@ -988,6 +989,11 @@ static void ravb_adjust_link(struct net_ +@@ -998,6 +999,11 @@ static void ravb_adjust_link(struct net_ phy_print_status(phydev); } @@ -39,7 +39,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* PHY init function */ static int ravb_phy_init(struct net_device *ndev) { -@@ -1023,10 +1029,10 @@ static int ravb_phy_init(struct net_devi +@@ -1033,10 +1039,10 @@ static int ravb_phy_init(struct net_devi goto err_deregister_fixed_link; } diff --git a/patches.renesas/0219-ravb-Double-free-on-error-in-ravb_start_xmit.patch b/patches.renesas/0219-ravb-Double-free-on-error-in-ravb_start_xmit.patch index c50daf65f7a0e1..93e31078124544 100644 --- a/patches.renesas/0219-ravb-Double-free-on-error-in-ravb_start_xmit.patch +++ b/patches.renesas/0219-ravb-Double-free-on-error-in-ravb_start_xmit.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c -@@ -1516,11 +1516,12 @@ static netdev_tx_t ravb_start_xmit(struc +@@ -1492,11 +1492,12 @@ static netdev_tx_t ravb_start_xmit(struc spin_unlock_irqrestore(&priv->lock, flags); return NETDEV_TX_BUSY; } diff --git a/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch b/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch index b45a88a2c7743a..e2a5ed0125228b 100644 --- a/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch +++ b/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch @@ -66,7 +66,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> WARN_ON(slot_id != TRB_TO_SLOT_ID( --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1809,7 +1809,7 @@ static int xhci_configure_endpoint_resul +@@ -1848,7 +1848,7 @@ static int xhci_configure_endpoint_resul switch (*cmd_status) { case COMP_COMMAND_ABORTED: @@ -75,7 +75,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_warn(xhci, "Timeout while waiting for configure endpoint command\n"); ret = -ETIME; break; -@@ -1859,7 +1859,7 @@ static int xhci_evaluate_context_result( +@@ -1898,7 +1898,7 @@ static int xhci_evaluate_context_result( switch (*cmd_status) { case COMP_COMMAND_ABORTED: @@ -84,7 +84,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_warn(xhci, "Timeout while waiting for evaluate context command\n"); ret = -ETIME; break; -@@ -3478,7 +3478,7 @@ static int xhci_discover_or_reset_device +@@ -3517,7 +3517,7 @@ static int xhci_discover_or_reset_device ret = reset_device_cmd->status; switch (ret) { case COMP_COMMAND_ABORTED: @@ -93,7 +93,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_warn(xhci, "Timeout waiting for reset device command\n"); ret = -ETIME; goto command_cleanup; -@@ -3863,7 +3863,7 @@ static int xhci_setup_device(struct usb_ +@@ -3902,7 +3902,7 @@ static int xhci_setup_device(struct usb_ */ switch (command->status) { case COMP_COMMAND_ABORTED: diff --git a/patches.renesas/0225-serial-sh-sci-Remove-unused-platform-data-capabiliti.patch b/patches.renesas/0225-serial-sh-sci-Remove-unused-platform-data-capabiliti.patch index a9625a74121a94..8a3b6a5588a31f 100644 --- a/patches.renesas/0225-serial-sh-sci-Remove-unused-platform-data-capabiliti.patch +++ b/patches.renesas/0225-serial-sh-sci-Remove-unused-platform-data-capabiliti.patch @@ -45,7 +45,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return; if (!(mctrl & TIOCM_RTS)) { -@@ -2829,6 +2830,7 @@ sci_parse_dt(struct platform_device *pde +@@ -2827,6 +2828,7 @@ sci_parse_dt(struct platform_device *pde struct device_node *np = pdev->dev.of_node; const struct of_device_id *match; struct plat_sci_port *p; @@ -53,7 +53,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> int id; if (!IS_ENABLED(CONFIG_OF) || !np) -@@ -2849,13 +2851,14 @@ sci_parse_dt(struct platform_device *pde +@@ -2847,13 +2849,14 @@ sci_parse_dt(struct platform_device *pde return NULL; } @@ -69,7 +69,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return p; } -@@ -2883,7 +2886,7 @@ static int sci_probe_single(struct platf +@@ -2881,7 +2884,7 @@ static int sci_probe_single(struct platf if (IS_ERR(sciport->gpios) && PTR_ERR(sciport->gpios) != -ENOSYS) return PTR_ERR(sciport->gpios); diff --git a/patches.renesas/0227-serial-sh-sci-Reformat-sci_parse_dt-for-git-diff.patch b/patches.renesas/0227-serial-sh-sci-Reformat-sci_parse_dt-for-git-diff.patch index 21ef33f966a88e..016e4ebf06cbc4 100644 --- a/patches.renesas/0227-serial-sh-sci-Reformat-sci_parse_dt-for-git-diff.patch +++ b/patches.renesas/0227-serial-sh-sci-Reformat-sci_parse_dt-for-git-diff.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c -@@ -2830,8 +2830,8 @@ static const struct of_device_id of_sci_ +@@ -2828,8 +2828,8 @@ static const struct of_device_id of_sci_ }; MODULE_DEVICE_TABLE(of, of_sci_match); diff --git a/patches.renesas/0233-serial-sh-sci-make-RX-FIFO-parameters-tunable-via-sy.patch b/patches.renesas/0233-serial-sh-sci-make-RX-FIFO-parameters-tunable-via-sy.patch index 31dcddcd2500c4..5e25570167f9ae 100644 --- a/patches.renesas/0233-serial-sh-sci-make-RX-FIFO-parameters-tunable-via-sy.patch +++ b/patches.renesas/0233-serial-sh-sci-make-RX-FIFO-parameters-tunable-via-sy.patch @@ -85,7 +85,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> #ifdef CONFIG_SERIAL_SH_SCI_DMA static void sci_dma_tx_complete(void *arg) { -@@ -2906,6 +2966,15 @@ static int sci_remove(struct platform_de +@@ -2904,6 +2964,15 @@ static int sci_remove(struct platform_de sci_cleanup_single(port); @@ -101,7 +101,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 0; } -@@ -3071,6 +3140,24 @@ static int sci_probe(struct platform_dev +@@ -3069,6 +3138,24 @@ static int sci_probe(struct platform_dev if (ret) return ret; diff --git a/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch b/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch index 438cb3ca847d7e..199064cabc4d79 100644 --- a/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch +++ b/patches.renesas/0272-usb-host-xhci-make-use-of-new-usb_endpoint_maxp_mult.patch @@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1419,7 +1419,7 @@ static u32 xhci_get_endpoint_max_burst(s +@@ -1421,7 +1421,7 @@ static u32 xhci_get_endpoint_max_burst(s if (udev->speed == USB_SPEED_HIGH && (usb_endpoint_xfer_isoc(&ep->desc) || usb_endpoint_xfer_int(&ep->desc))) @@ -27,7 +27,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 0; } -@@ -1465,9 +1465,9 @@ static u32 xhci_get_max_esit_payload(str +@@ -1467,9 +1467,9 @@ static u32 xhci_get_max_esit_payload(str return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); max_packet = GET_MAX_PACKET(usb_endpoint_maxp(&ep->desc)); diff --git a/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch b/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch index 95a2a72d19ef07..b9fcdf360a6182 100644 --- a/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch +++ b/patches.renesas/0273-usb-host-xhci-purge-GET_MAX_PACKET.patch @@ -20,7 +20,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1464,7 +1464,7 @@ static u32 xhci_get_max_esit_payload(str +@@ -1466,7 +1466,7 @@ static u32 xhci_get_max_esit_payload(str else if (udev->speed >= USB_SPEED_SUPER) return le16_to_cpu(ep->ss_ep_comp.wBytesPerInterval); @@ -29,7 +29,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> max_burst = usb_endpoint_maxp_mult(&ep->desc); /* A 0 in max burst means 1 transfer per ESIT */ return max_packet * max_burst; -@@ -1521,7 +1521,7 @@ int xhci_endpoint_init(struct xhci_hcd * +@@ -1523,7 +1523,7 @@ int xhci_endpoint_init(struct xhci_hcd * } mult = xhci_get_endpoint_mult(udev, ep); @@ -89,7 +89,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* A zero-length transfer still involves at least one packet. */ --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -3202,7 +3202,7 @@ int xhci_alloc_streams(struct usb_hcd *h +@@ -3241,7 +3241,7 @@ int xhci_alloc_streams(struct usb_hcd *h for (i = 0; i < num_eps; i++) { ep_index = xhci_get_endpoint_index(&eps[i]->desc); @@ -100,7 +100,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> num_streams, --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -747,11 +747,6 @@ struct xhci_ep_ctx { +@@ -751,11 +751,6 @@ struct xhci_ep_ctx { #define MAX_PACKET_MASK (0xffff << 16) #define MAX_PACKET_DECODED(p) (((p) >> 16) & 0xffff) diff --git a/patches.renesas/0289-usb-xhci-clean-up-error_bitmask-usage.patch b/patches.renesas/0289-usb-xhci-clean-up-error_bitmask-usage.patch index 4e6fe2eeac1c66..418f618b02b324 100644 --- a/patches.renesas/0289-usb-xhci-clean-up-error_bitmask-usage.patch +++ b/patches.renesas/0289-usb-xhci-clean-up-error_bitmask-usage.patch @@ -137,7 +137,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> * to make sure a watchdog timer didn't mark the host as non-responsive. --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1614,8 +1614,6 @@ struct xhci_hcd { +@@ -1618,8 +1618,6 @@ struct xhci_hcd { #define XHCI_STATE_DYING (1 << 0) #define XHCI_STATE_HALTED (1 << 1) #define XHCI_STATE_REMOVING (1 << 2) diff --git a/patches.renesas/0290-xhci-add-helper-to-get-the-endpoint-state-of-a-endpo.patch b/patches.renesas/0290-xhci-add-helper-to-get-the-endpoint-state-of-a-endpo.patch index 13b8f6ad8d0c6c..2124395582918d 100644 --- a/patches.renesas/0290-xhci-add-helper-to-get-the-endpoint-state-of-a-endpo.patch +++ b/patches.renesas/0290-xhci-add-helper-to-get-the-endpoint-state-of-a-endpo.patch @@ -83,7 +83,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> } --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -1643,8 +1643,7 @@ int xhci_drop_endpoint(struct usb_hcd *h +@@ -1682,8 +1682,7 @@ int xhci_drop_endpoint(struct usb_hcd *h /* If the HC already knows the endpoint is disabled, * or the HCD has noted it is disabled, ignore this request */ @@ -95,7 +95,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Do not warn when called after a usb_device_reset */ --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -709,6 +709,8 @@ struct xhci_ep_ctx { +@@ -713,6 +713,8 @@ struct xhci_ep_ctx { #define EP_STATE_HALTED 2 #define EP_STATE_STOPPED 3 #define EP_STATE_ERROR 4 diff --git a/patches.renesas/0291-usb-xhci-cleanup-cmd_completion-in-xhci_virt_device.patch b/patches.renesas/0291-usb-xhci-cleanup-cmd_completion-in-xhci_virt_device.patch index 4cad5cc13fd5aa..78f3ae9f558b91 100644 --- a/patches.renesas/0291-usb-xhci-cleanup-cmd_completion-in-xhci_virt_device.patch +++ b/patches.renesas/0291-usb-xhci-cleanup-cmd_completion-in-xhci_virt_device.patch @@ -19,7 +19,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -1072,7 +1072,6 @@ int xhci_alloc_virt_device(struct xhci_h +@@ -1074,7 +1074,6 @@ int xhci_alloc_virt_device(struct xhci_h goto fail; dev->num_rings_cached = 0; @@ -29,7 +29,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Point to output device context in dcbaa. */ --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -994,7 +994,6 @@ struct xhci_virt_device { +@@ -998,7 +998,6 @@ struct xhci_virt_device { int num_rings_cached; #define XHCI_MAX_RINGS_CACHED 31 struct xhci_virt_ep eps[31]; diff --git a/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch b/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch index c74f49c8d33d70..8b846853f31d0a 100644 --- a/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch +++ b/patches.renesas/0292-usb-xhci-remove-the-use-of-xhci-addr_dev.patch @@ -23,7 +23,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2598,7 +2598,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2600,7 +2600,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, * something other than the default (~1ms minimum between interrupts). * See section 5.5.1.2. */ @@ -33,7 +33,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> for (i = 0; i < USB_MAXCHILDREN; ++i) { --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -3680,20 +3680,19 @@ int xhci_alloc_dev(struct usb_hcd *hcd, +@@ -3719,20 +3719,19 @@ int xhci_alloc_dev(struct usb_hcd *hcd, int ret, slot_id; struct xhci_command *command; @@ -56,7 +56,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 0; } xhci_ring_cmd_db(xhci); -@@ -3708,7 +3707,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, +@@ -3747,7 +3746,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, xhci_err(xhci, "Max number of devices this xHCI host supports is %u.\n", HCS_MAX_SLOTS( readl(&xhci->cap_regs->hcs_params1))); @@ -65,7 +65,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> return 0; } -@@ -3744,7 +3743,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, +@@ -3783,7 +3782,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, #endif @@ -74,7 +74,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* Is this a LS or FS device under a HS hub? */ /* Hub or peripherial? */ return 1; -@@ -3752,6 +3751,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, +@@ -3791,6 +3790,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, disable_slot: /* Disable slot, if we can do it without mem alloc */ spin_lock_irqsave(&xhci->lock, flags); @@ -82,7 +82,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> command->completion = NULL; command->status = 0; if (!xhci_queue_slot_control(xhci, command, TRB_DISABLE_SLOT, -@@ -3815,14 +3815,13 @@ static int xhci_setup_device(struct usb_ +@@ -3854,14 +3854,13 @@ static int xhci_setup_device(struct usb_ } } @@ -98,7 +98,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> slot_ctx = xhci_get_slot_ctx(xhci, virt_dev->in_ctx); ctrl_ctx = xhci_get_input_control_ctx(virt_dev->in_ctx); -@@ -3940,7 +3939,10 @@ static int xhci_setup_device(struct usb_ +@@ -3979,7 +3978,10 @@ static int xhci_setup_device(struct usb_ le32_to_cpu(slot_ctx->dev_state) & DEV_ADDR_MASK); out: mutex_unlock(&xhci->mutex); @@ -112,7 +112,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1580,7 +1580,6 @@ struct xhci_hcd { +@@ -1584,7 +1584,6 @@ struct xhci_hcd { /* slot enabling and address device helpers */ /* these are not thread safe so use mutex */ struct mutex mutex; diff --git a/patches.renesas/0293-usb-xhci-move-slot_id-from-xhci_hcd-to-xhci_command-.patch b/patches.renesas/0293-usb-xhci-move-slot_id-from-xhci_hcd-to-xhci_command-.patch index 3785dcb1766bb2..386c4dc1a62f9e 100644 --- a/patches.renesas/0293-usb-xhci-move-slot_id-from-xhci_hcd-to-xhci_command-.patch +++ b/patches.renesas/0293-usb-xhci-move-slot_id-from-xhci_hcd-to-xhci_command-.patch @@ -52,7 +52,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> xhci_handle_cmd_disable_slot(xhci, slot_id); --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c -@@ -3699,7 +3699,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, +@@ -3738,7 +3738,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, spin_unlock_irqrestore(&xhci->lock, flags); wait_for_completion(command->completion); @@ -63,7 +63,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> if (!slot_id || command->status != COMP_SUCCESS) { --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -786,6 +786,7 @@ struct xhci_command { +@@ -790,6 +790,7 @@ struct xhci_command { /* Input context for changing device state */ struct xhci_container_ctx *in_ctx; u32 status; @@ -71,7 +71,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au> /* If completion is null, no one is waiting on this command * and the structure can be freed after the command completes. */ -@@ -1580,7 +1581,6 @@ struct xhci_hcd { +@@ -1584,7 +1585,6 @@ struct xhci_hcd { /* slot enabling and address device helpers */ /* these are not thread safe so use mutex */ struct mutex mutex; @@ -358,7 +358,6 @@ patches.renesas/0050-gpio-rcar-Fine-grained-Runtime-PM-support.patch patches.renesas/0051-regulator-gpio-correct-default-type.patch patches.renesas/0054-i2c-sh_mobile-document-support-for-r8a7796-R-Car-M3-.patch patches.renesas/0055-iommu-ipmmu-vmsa-Restrict-IOMMU-Domain-Geometry-to-3.patch -patches.renesas/0056-mtd-m25p80-consider-max-message-size-in-m25p80_read.patch patches.renesas/0057-mtd-spi-nor-add-dt-support-for-Everspin-MRAMs.patch patches.renesas/0058-ARM-shmobile-defconfig-Enable-CONFIG_VIDEO_ADV7604.patch patches.renesas/0059-ARM-shmobile-defconfig-Enable-CMA-for-DMA.patch @@ -405,7 +404,6 @@ patches.renesas/0100-clocksource-drivers-ostm-Add-renesas-ostm-timer-driv.patch patches.renesas/0101-PCI-rcar-Return-ENODEV-from-host-bridge-probe-when-n.patch patches.renesas/0102-PCI-rcar-Add-compatible-string-for-r8a7796.patch patches.renesas/0103-PCI-rcar-Use-of_device_get_match_data-to-simplify-pr.patch -patches.renesas/0104-net-phy-micrel-fix-crash-when-statistic-requested-fo.patch patches.renesas/0105-Revert-phy-micrel-Disable-auto-negotiation-on-startu.patch patches.renesas/0106-phy-rcar-gen3-usb2-Replace-the-deprecated-extcon-API.patch patches.renesas/0107-can-rcar_can-Do-not-print-virtual-addresses.patch @@ -599,7 +597,6 @@ patches.renesas/0045-clk-renesas-Add-r8a7795-ES2.0-CPG-Core-Clock-Definit.patch patches.renesas/0046-arm64-kdump-enable-kdump-in-defconfig.patch patches.renesas/0047-arm64-dts-r8a7795-salvator-x-Drop-_clk-suffix-from-X.patch patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch -patches.renesas/0049-i2c-rcar-fix-resume-by-always-initializing-registers.patch patches.renesas/0050-i2c-rcar-clarify-PM-handling-with-more-comments.patch patches.renesas/0051-i2c-rcar-use-correct-length-when-unmapping-DMA.patch patches.renesas/0052-ARM-dts-r7s72100-update-sdhi-clock-bindings.patch |