kernel: bump 5.15 to 5.15.155
Manual adapted the following patches:
   generic/hack-5.15/221-module_exports.patch
   bcm27xx/patches-5.15/950-0008-drm-vc4-hdmi-Use-a-mutex-to-prevent-concurrent-frame.patch
   octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 9693ed6a9e)
			
			
This commit is contained in:
		| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.15 = .153 | LINUX_VERSION-5.15 = .155 | ||||||
| LINUX_KERNEL_HASH-5.15.153 = d7ddb1e144a88773b56a5b4a71baea0b241f3996d446be45290537c6997c84bc | LINUX_KERNEL_HASH-5.15.155 = c85859b86d2e6d1fc91ca1be8b44f24a9b5bb9f86869b04a8665a3a6559126e4 | ||||||
|   | |||||||
| @@ -70,9 +70,9 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech> | |||||||
|  	edid = drm_get_edid(connector, vc4_hdmi->ddc); |  	edid = drm_get_edid(connector, vc4_hdmi->ddc); | ||||||
|  	cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid); |  	cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid); | ||||||
| -	if (!edid) | -	if (!edid) | ||||||
| -		return -ENODEV; | -		return 0; | ||||||
| +	if (!edid) { | +	if (!edid) { | ||||||
| +		ret = -ENODEV; | +		ret = 0; | ||||||
| +		goto out; | +		goto out; | ||||||
| +	} | +	} | ||||||
|   |   | ||||||
|   | |||||||
| @@ -1123,7 +1123,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|  } |  } | ||||||
| --- a/drivers/usb/core/hub.c
 | --- a/drivers/usb/core/hub.c
 | ||||||
| +++ b/drivers/usb/core/hub.c
 | +++ b/drivers/usb/core/hub.c
 | ||||||
| @@ -5667,7 +5667,7 @@ static void port_event(struct usb_hub *h
 | @@ -5676,7 +5676,7 @@ static void port_event(struct usb_hub *h
 | ||||||
|  		port_dev->over_current_count++; |  		port_dev->over_current_count++; | ||||||
|  		port_over_current_notify(port_dev); |  		port_over_current_notify(port_dev); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -244,7 +244,7 @@ bcm2835-mmc: uninitialized_var is no more | |||||||
|  static inline int mmc_blk_part_switch(struct mmc_card *card, |  static inline int mmc_blk_part_switch(struct mmc_card *card, | ||||||
|  				      unsigned int part_type); |  				      unsigned int part_type); | ||||||
|  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, |  static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, | ||||||
| @@ -2986,6 +2993,8 @@ static int mmc_blk_probe(struct mmc_card | @@ -2988,6 +2995,8 @@ static int mmc_blk_probe(struct mmc_card | ||||||
|  { |  { | ||||||
|  	struct mmc_blk_data *md; |  	struct mmc_blk_data *md; | ||||||
|  	int ret = 0; |  	int ret = 0; | ||||||
| @@ -253,7 +253,7 @@ bcm2835-mmc: uninitialized_var is no more | |||||||
|   |   | ||||||
|  	/* |  	/* | ||||||
|  	 * Check that the card supports the command class(es) we need. |  	 * Check that the card supports the command class(es) we need. | ||||||
| @@ -2993,7 +3002,16 @@ static int mmc_blk_probe(struct mmc_card | @@ -2995,7 +3004,16 @@ static int mmc_blk_probe(struct mmc_card | ||||||
|  	if (!(card->csd.cmdclass & CCC_BLOCK_READ)) |  	if (!(card->csd.cmdclass & CCC_BLOCK_READ)) | ||||||
|  		return -ENODEV; |  		return -ENODEV; | ||||||
|   |   | ||||||
| @@ -271,7 +271,7 @@ bcm2835-mmc: uninitialized_var is no more | |||||||
|   |   | ||||||
|  	card->complete_wq = alloc_workqueue("mmc_complete", |  	card->complete_wq = alloc_workqueue("mmc_complete", | ||||||
|  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); |  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); | ||||||
| @@ -3008,6 +3026,17 @@ static int mmc_blk_probe(struct mmc_card | @@ -3010,6 +3028,17 @@ static int mmc_blk_probe(struct mmc_card | ||||||
|  		goto out_free; |  		goto out_free; | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|   | |||||||
| @@ -16797,7 +16797,7 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com> | |||||||
| +#endif  /* _TAS5713_H */ | +#endif  /* _TAS5713_H */ | ||||||
| --- a/sound/soc/soc-core.c | --- a/sound/soc/soc-core.c | ||||||
| +++ b/sound/soc/soc-core.c | +++ b/sound/soc/soc-core.c | ||||||
| @@ -1231,7 +1231,7 @@ found: | @@ -1234,7 +1234,7 @@ found: | ||||||
|   * Returns 0 on success, otherwise a negative error code. |   * Returns 0 on success, otherwise a negative error code. | ||||||
|   */ |   */ | ||||||
|  int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, |  int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, | ||||||
| @@ -16806,7 +16806,7 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com> | |||||||
|  { |  { | ||||||
|  	struct snd_soc_dai *cpu_dai; |  	struct snd_soc_dai *cpu_dai; | ||||||
|  	struct snd_soc_dai *codec_dai; |  	struct snd_soc_dai *codec_dai; | ||||||
| @@ -1240,7 +1240,15 @@ int snd_soc_runtime_set_dai_fmt(struct s | @@ -1243,7 +1243,15 @@ int snd_soc_runtime_set_dai_fmt(struct s | ||||||
|  	int ret; |  	int ret; | ||||||
|   |   | ||||||
|  	for_each_rtd_codec_dais(rtd, i, codec_dai) { |  	for_each_rtd_codec_dais(rtd, i, codec_dai) { | ||||||
| @@ -16823,7 +16823,7 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com> | |||||||
|  		if (ret != 0 && ret != -ENOTSUPP) |  		if (ret != 0 && ret != -ENOTSUPP) | ||||||
|  			return ret; |  			return ret; | ||||||
|  	} |  	} | ||||||
| @@ -1249,8 +1257,21 @@ int snd_soc_runtime_set_dai_fmt(struct s | @@ -1252,8 +1260,21 @@ int snd_soc_runtime_set_dai_fmt(struct s | ||||||
|  	 * Flip the polarity for the "CPU" end of a CODEC<->CODEC link |  	 * Flip the polarity for the "CPU" end of a CODEC<->CODEC link | ||||||
|  	 * the component which has non_legacy_dai_naming is Codec |  	 * the component which has non_legacy_dai_naming is Codec | ||||||
|  	 */ |  	 */ | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> | |||||||
|  |  | ||||||
| --- a/drivers/tty/serial/sc16is7xx.c | --- a/drivers/tty/serial/sc16is7xx.c | ||||||
| +++ b/drivers/tty/serial/sc16is7xx.c | +++ b/drivers/tty/serial/sc16is7xx.c | ||||||
| @@ -709,6 +709,8 @@ static bool sc16is7xx_port_irq(struct sc | @@ -710,6 +710,8 @@ static bool sc16is7xx_port_irq(struct sc | ||||||
|   |   | ||||||
|  			if (rxlen) |  			if (rxlen) | ||||||
|  				sc16is7xx_handle_rx(port, rxlen, iir); |  				sc16is7xx_handle_rx(port, rxlen, iir); | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  |  | ||||||
| --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||||||
| +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||||||
| @@ -1775,7 +1775,7 @@ int vchiq_mmal_component_enable(struct v | @@ -1776,7 +1776,7 @@ int vchiq_mmal_component_enable(struct v | ||||||
|   |   | ||||||
|  	ret = enable_component(instance, component); |  	ret = enable_component(instance, component); | ||||||
|  	if (ret == 0) |  	if (ret == 0) | ||||||
|   | |||||||
| @@ -234,7 +234,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  /* deals with receipt of buffer to host message */ |  /* deals with receipt of buffer to host message */ | ||||||
|  static void buffer_to_host_cb(struct vchiq_mmal_instance *instance, |  static void buffer_to_host_cb(struct vchiq_mmal_instance *instance, | ||||||
|  			      struct mmal_msg *msg, u32 msg_len) |  			      struct mmal_msg *msg, u32 msg_len) | ||||||
| @@ -1332,6 +1425,7 @@ static int port_disable(struct vchiq_mma | @@ -1333,6 +1426,7 @@ static int port_disable(struct vchiq_mma | ||||||
|  				mmalbuf->mmal_flags = 0; |  				mmalbuf->mmal_flags = 0; | ||||||
|  				mmalbuf->dts = MMAL_TIME_UNKNOWN; |  				mmalbuf->dts = MMAL_TIME_UNKNOWN; | ||||||
|  				mmalbuf->pts = MMAL_TIME_UNKNOWN; |  				mmalbuf->pts = MMAL_TIME_UNKNOWN; | ||||||
| @@ -242,7 +242,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  				port->buffer_cb(instance, |  				port->buffer_cb(instance, | ||||||
|  						port, 0, mmalbuf); |  						port, 0, mmalbuf); | ||||||
|  			} |  			} | ||||||
| @@ -1633,6 +1727,43 @@ int mmal_vchi_buffer_cleanup(struct mmal | @@ -1634,6 +1728,43 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||||||
|  } |  } | ||||||
|  EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup); |  EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup); | ||||||
|   |   | ||||||
| @@ -286,7 +286,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  /* Initialise a mmal component and its ports |  /* Initialise a mmal component and its ports | ||||||
|   * |   * | ||||||
|   */ |   */ | ||||||
| @@ -1682,6 +1813,7 @@ int vchiq_mmal_component_init(struct vch | @@ -1683,6 +1814,7 @@ int vchiq_mmal_component_init(struct vch | ||||||
|  	ret = port_info_get(instance, &component->control); |  	ret = port_info_get(instance, &component->control); | ||||||
|  	if (ret < 0) |  	if (ret < 0) | ||||||
|  		goto release_component; |  		goto release_component; | ||||||
| @@ -294,7 +294,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|   |   | ||||||
|  	for (idx = 0; idx < component->inputs; idx++) { |  	for (idx = 0; idx < component->inputs; idx++) { | ||||||
|  		component->input[idx].type = MMAL_PORT_TYPE_INPUT; |  		component->input[idx].type = MMAL_PORT_TYPE_INPUT; | ||||||
| @@ -1692,6 +1824,7 @@ int vchiq_mmal_component_init(struct vch | @@ -1693,6 +1825,7 @@ int vchiq_mmal_component_init(struct vch | ||||||
|  		ret = port_info_get(instance, &component->input[idx]); |  		ret = port_info_get(instance, &component->input[idx]); | ||||||
|  		if (ret < 0) |  		if (ret < 0) | ||||||
|  			goto release_component; |  			goto release_component; | ||||||
| @@ -302,7 +302,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  	} |  	} | ||||||
|   |   | ||||||
|  	for (idx = 0; idx < component->outputs; idx++) { |  	for (idx = 0; idx < component->outputs; idx++) { | ||||||
| @@ -1703,6 +1836,7 @@ int vchiq_mmal_component_init(struct vch | @@ -1704,6 +1837,7 @@ int vchiq_mmal_component_init(struct vch | ||||||
|  		ret = port_info_get(instance, &component->output[idx]); |  		ret = port_info_get(instance, &component->output[idx]); | ||||||
|  		if (ret < 0) |  		if (ret < 0) | ||||||
|  			goto release_component; |  			goto release_component; | ||||||
| @@ -310,7 +310,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  	} |  	} | ||||||
|   |   | ||||||
|  	for (idx = 0; idx < component->clocks; idx++) { |  	for (idx = 0; idx < component->clocks; idx++) { | ||||||
| @@ -1714,6 +1848,7 @@ int vchiq_mmal_component_init(struct vch | @@ -1715,6 +1849,7 @@ int vchiq_mmal_component_init(struct vch | ||||||
|  		ret = port_info_get(instance, &component->clock[idx]); |  		ret = port_info_get(instance, &component->clock[idx]); | ||||||
|  		if (ret < 0) |  		if (ret < 0) | ||||||
|  			goto release_component; |  			goto release_component; | ||||||
| @@ -318,7 +318,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  	} |  	} | ||||||
|   |   | ||||||
|  	*component_out = component; |  	*component_out = component; | ||||||
| @@ -1739,7 +1874,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i | @@ -1740,7 +1875,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i | ||||||
|  int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, |  int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, | ||||||
|  				  struct vchiq_mmal_component *component) |  				  struct vchiq_mmal_component *component) | ||||||
|  { |  { | ||||||
| @@ -327,7 +327,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|   |   | ||||||
|  	if (mutex_lock_interruptible(&instance->vchiq_mutex)) |  	if (mutex_lock_interruptible(&instance->vchiq_mutex)) | ||||||
|  		return -EINTR; |  		return -EINTR; | ||||||
| @@ -1751,6 +1886,13 @@ int vchiq_mmal_component_finalise(struct | @@ -1752,6 +1887,13 @@ int vchiq_mmal_component_finalise(struct | ||||||
|   |   | ||||||
|  	component->in_use = 0; |  	component->in_use = 0; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  |  | ||||||
| --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||||||
| +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||||||
| @@ -1901,6 +1901,8 @@ int vchiq_mmal_component_finalise(struct | @@ -1902,6 +1902,8 @@ int vchiq_mmal_component_finalise(struct | ||||||
|  	for (idx = 0; idx < component->clocks; idx++) |  	for (idx = 0; idx < component->clocks; idx++) | ||||||
|  		free_event_context(&component->clock[idx]); |  		free_event_context(&component->clock[idx]); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  |  | ||||||
| --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||||||
| +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||||||
| @@ -1767,9 +1767,26 @@ static void free_event_context(struct vc | @@ -1768,9 +1768,26 @@ static void free_event_context(struct vc | ||||||
|  { |  { | ||||||
|  	struct mmal_msg_context *ctx = port->event_context; |  	struct mmal_msg_context *ctx = port->event_context; | ||||||
|   |   | ||||||
| @@ -41,7 +41,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  } |  } | ||||||
|   |   | ||||||
|  /* Initialise a mmal component and its ports |  /* Initialise a mmal component and its ports | ||||||
| @@ -1867,6 +1884,7 @@ int vchiq_mmal_component_init(struct vch | @@ -1868,6 +1885,7 @@ int vchiq_mmal_component_init(struct vch | ||||||
|   |   | ||||||
|  release_component: |  release_component: | ||||||
|  	destroy_component(instance, component); |  	destroy_component(instance, component); | ||||||
| @@ -49,7 +49,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|  unlock: |  unlock: | ||||||
|  	if (component) |  	if (component) | ||||||
|  		component->in_use = 0; |  		component->in_use = 0; | ||||||
| @@ -1882,7 +1900,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i | @@ -1883,7 +1901,7 @@ EXPORT_SYMBOL_GPL(vchiq_mmal_component_i | ||||||
|  int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, |  int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance, | ||||||
|  				  struct vchiq_mmal_component *component) |  				  struct vchiq_mmal_component *component) | ||||||
|  { |  { | ||||||
| @@ -58,7 +58,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org> | |||||||
|   |   | ||||||
|  	if (mutex_lock_interruptible(&instance->vchiq_mutex)) |  	if (mutex_lock_interruptible(&instance->vchiq_mutex)) | ||||||
|  		return -EINTR; |  		return -EINTR; | ||||||
| @@ -1894,14 +1912,7 @@ int vchiq_mmal_component_finalise(struct | @@ -1895,14 +1913,7 @@ int vchiq_mmal_component_finalise(struct | ||||||
|   |   | ||||||
|  	component->in_use = 0; |  	component->in_use = 0; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|  |  | ||||||
| --- a/drivers/usb/host/xhci.c | --- a/drivers/usb/host/xhci.c | ||||||
| +++ b/drivers/usb/host/xhci.c | +++ b/drivers/usb/host/xhci.c | ||||||
| @@ -1631,6 +1631,109 @@ command_cleanup: | @@ -1633,6 +1633,109 @@ command_cleanup: | ||||||
|  } |  } | ||||||
|   |   | ||||||
|  /* |  /* | ||||||
| @@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org> | |||||||
|   * non-error returns are a promise to giveback() the urb later |   * non-error returns are a promise to giveback() the urb later | ||||||
|   * we drop ownership so next owner (or urb unlink) can get it |   * we drop ownership so next owner (or urb unlink) can get it | ||||||
|   */ |   */ | ||||||
| @@ -5470,6 +5573,7 @@ static const struct hc_driver xhci_hc_dr | @@ -5472,6 +5575,7 @@ static const struct hc_driver xhci_hc_dr | ||||||
|  	.endpoint_reset =	xhci_endpoint_reset, |  	.endpoint_reset =	xhci_endpoint_reset, | ||||||
|  	.check_bandwidth =	xhci_check_bandwidth, |  	.check_bandwidth =	xhci_check_bandwidth, | ||||||
|  	.reset_bandwidth =	xhci_reset_bandwidth, |  	.reset_bandwidth =	xhci_reset_bandwidth, | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/drivers/tty/serial/sc16is7xx.c | --- a/drivers/tty/serial/sc16is7xx.c | ||||||
| +++ b/drivers/tty/serial/sc16is7xx.c | +++ b/drivers/tty/serial/sc16is7xx.c | ||||||
| @@ -524,8 +524,9 @@ static int sc16is7xx_set_baud(struct uar | @@ -525,8 +525,9 @@ static int sc16is7xx_set_baud(struct uar | ||||||
|   |   | ||||||
|  	/* Enable enhanced features */ |  	/* Enable enhanced features */ | ||||||
|  	regcache_cache_bypass(s->regmap, true); |  	regcache_cache_bypass(s->regmap, true); | ||||||
| @@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> | |||||||
|  	regcache_cache_bypass(s->regmap, false); |  	regcache_cache_bypass(s->regmap, false); | ||||||
|   |   | ||||||
|  	/* Put LCR back to the normal mode */ |  	/* Put LCR back to the normal mode */ | ||||||
| @@ -855,7 +856,7 @@ static unsigned int sc16is7xx_get_mctrl( | @@ -856,7 +857,7 @@ static unsigned int sc16is7xx_get_mctrl( | ||||||
|  	/* DCD and DSR are not wired and CTS/RTS is handled automatically |  	/* DCD and DSR are not wired and CTS/RTS is handled automatically | ||||||
|  	 * so just indicate DSR and CAR asserted |  	 * so just indicate DSR and CAR asserted | ||||||
|  	 */ |  	 */ | ||||||
| @@ -47,7 +47,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com> | |||||||
|  } |  } | ||||||
|   |   | ||||||
|  static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl) |  static void sc16is7xx_set_mctrl(struct uart_port *port, unsigned int mctrl) | ||||||
| @@ -942,14 +943,19 @@ static void sc16is7xx_set_termios(struct | @@ -943,14 +944,19 @@ static void sc16is7xx_set_termios(struct | ||||||
|  	regcache_cache_bypass(s->regmap, true); |  	regcache_cache_bypass(s->regmap, true); | ||||||
|  	sc16is7xx_port_write(port, SC16IS7XX_XON1_REG, termios->c_cc[VSTART]); |  	sc16is7xx_port_write(port, SC16IS7XX_XON1_REG, termios->c_cc[VSTART]); | ||||||
|  	sc16is7xx_port_write(port, SC16IS7XX_XOFF1_REG, termios->c_cc[VSTOP]); |  	sc16is7xx_port_write(port, SC16IS7XX_XOFF1_REG, termios->c_cc[VSTOP]); | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -17535,6 +17535,14 @@ T:	git git://linuxtv.org/media_tree.git | @@ -17542,6 +17542,14 @@ T:	git git://linuxtv.org/media_tree.git | ||||||
|  F:	Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml |  F:	Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml | ||||||
|  F:	drivers/media/i2c/imx412.c |  F:	drivers/media/i2c/imx412.c | ||||||
|   |   | ||||||
|   | |||||||
| @@ -91,7 +91,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  	} else if (msg->u.buffer_from_host.buffer_header.length == 0) { |  	} else if (msg->u.buffer_from_host.buffer_header.length == 0) { | ||||||
|  		/* empty buffer */ |  		/* empty buffer */ | ||||||
|  		if (msg->u.buffer_from_host.buffer_header.flags & |  		if (msg->u.buffer_from_host.buffer_header.flags & | ||||||
| @@ -1530,6 +1553,9 @@ int vchiq_mmal_port_parameter_set(struct | @@ -1531,6 +1554,9 @@ int vchiq_mmal_port_parameter_set(struct | ||||||
|   |   | ||||||
|  	mutex_unlock(&instance->vchiq_mutex); |  	mutex_unlock(&instance->vchiq_mutex); | ||||||
|   |   | ||||||
| @@ -101,7 +101,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  	return ret; |  	return ret; | ||||||
|  } |  } | ||||||
|  EXPORT_SYMBOL_GPL(vchiq_mmal_port_parameter_set); |  EXPORT_SYMBOL_GPL(vchiq_mmal_port_parameter_set); | ||||||
| @@ -1698,6 +1724,31 @@ int vchiq_mmal_submit_buffer(struct vchi | @@ -1699,6 +1725,31 @@ int vchiq_mmal_submit_buffer(struct vchi | ||||||
|  	unsigned long flags = 0; |  	unsigned long flags = 0; | ||||||
|  	int ret; |  	int ret; | ||||||
|   |   | ||||||
| @@ -133,7 +133,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  	ret = buffer_from_host(instance, port, buffer); |  	ret = buffer_from_host(instance, port, buffer); | ||||||
|  	if (ret == -EINVAL) { |  	if (ret == -EINVAL) { | ||||||
|  		/* Port is disabled. Queue for when it is enabled. */ |  		/* Port is disabled. Queue for when it is enabled. */ | ||||||
| @@ -1731,6 +1782,16 @@ int mmal_vchi_buffer_cleanup(struct mmal | @@ -1732,6 +1783,16 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||||||
|  		release_msg_context(msg_context); |  		release_msg_context(msg_context); | ||||||
|  	buf->msg_context = NULL; |  	buf->msg_context = NULL; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com> | |||||||
| +... | +... | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -17549,6 +17549,7 @@ M:	Raspberry Pi Kernel Maintenance <kern | @@ -17556,6 +17556,7 @@ M:	Raspberry Pi Kernel Maintenance <kern | ||||||
|  L:	linux-media@vger.kernel.org |  L:	linux-media@vger.kernel.org | ||||||
|  S:	Maintained |  S:	Maintained | ||||||
|  T:	git git://linuxtv.org/media_tree.git |  T:	git git://linuxtv.org/media_tree.git | ||||||
|   | |||||||
| @@ -182,7 +182,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|   |   | ||||||
|  	vchiq_release_message(instance->service_handle, rmsg_handle); |  	vchiq_release_message(instance->service_handle, rmsg_handle); | ||||||
|   |   | ||||||
| @@ -1088,9 +1101,9 @@ static int create_component(struct vchiq | @@ -1089,9 +1102,9 @@ static int create_component(struct vchiq | ||||||
|  	component->outputs = rmsg->u.component_create_reply.output_num; |  	component->outputs = rmsg->u.component_create_reply.output_num; | ||||||
|  	component->clocks = rmsg->u.component_create_reply.clock_num; |  	component->clocks = rmsg->u.component_create_reply.clock_num; | ||||||
|   |   | ||||||
| @@ -195,7 +195,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|   |   | ||||||
|  release_msg: |  release_msg: | ||||||
|  	vchiq_release_message(instance->service_handle, rmsg_handle); |  	vchiq_release_message(instance->service_handle, rmsg_handle); | ||||||
| @@ -1259,10 +1272,9 @@ static int port_action_port(struct vchiq | @@ -1260,10 +1273,9 @@ static int port_action_port(struct vchiq | ||||||
|   |   | ||||||
|  	ret = -rmsg->u.port_action_reply.status; |  	ret = -rmsg->u.port_action_reply.status; | ||||||
|   |   | ||||||
| @@ -209,7 +209,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|   |   | ||||||
|  release_msg: |  release_msg: | ||||||
|  	vchiq_release_message(instance->service_handle, rmsg_handle); |  	vchiq_release_message(instance->service_handle, rmsg_handle); | ||||||
| @@ -1306,11 +1318,11 @@ static int port_action_handle(struct vch | @@ -1307,11 +1319,11 @@ static int port_action_handle(struct vch | ||||||
|   |   | ||||||
|  	ret = -rmsg->u.port_action_reply.status; |  	ret = -rmsg->u.port_action_reply.status; | ||||||
|   |   | ||||||
| @@ -226,7 +226,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|   |   | ||||||
|  release_msg: |  release_msg: | ||||||
|  	vchiq_release_message(instance->service_handle, rmsg_handle); |  	vchiq_release_message(instance->service_handle, rmsg_handle); | ||||||
| @@ -1349,9 +1361,9 @@ static int port_parameter_set(struct vch | @@ -1350,9 +1362,9 @@ static int port_parameter_set(struct vch | ||||||
|   |   | ||||||
|  	ret = -rmsg->u.port_parameter_set_reply.status; |  	ret = -rmsg->u.port_parameter_set_reply.status; | ||||||
|   |   | ||||||
| @@ -239,7 +239,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|   |   | ||||||
|  release_msg: |  release_msg: | ||||||
|  	vchiq_release_message(instance->service_handle, rmsg_handle); |  	vchiq_release_message(instance->service_handle, rmsg_handle); | ||||||
| @@ -1409,8 +1421,9 @@ static int port_parameter_get(struct vch | @@ -1410,8 +1422,9 @@ static int port_parameter_get(struct vch | ||||||
|  	/* Always report the size of the returned parameter to the caller */ |  	/* Always report the size of the returned parameter to the caller */ | ||||||
|  	*value_size = rmsg->u.port_parameter_get_reply.size; |  	*value_size = rmsg->u.port_parameter_get_reply.size; | ||||||
|   |   | ||||||
| @@ -251,7 +251,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|   |   | ||||||
|  release_msg: |  release_msg: | ||||||
|  	vchiq_release_message(instance->service_handle, rmsg_handle); |  	vchiq_release_message(instance->service_handle, rmsg_handle); | ||||||
| @@ -1667,7 +1680,7 @@ int vchiq_mmal_port_connect_tunnel(struc | @@ -1668,7 +1681,7 @@ int vchiq_mmal_port_connect_tunnel(struc | ||||||
|  	if (!dst) { |  	if (!dst) { | ||||||
|  		/* do not make new connection */ |  		/* do not make new connection */ | ||||||
|  		ret = 0; |  		ret = 0; | ||||||
| @@ -260,7 +260,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  		goto release_unlock; |  		goto release_unlock; | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
| @@ -1685,14 +1698,14 @@ int vchiq_mmal_port_connect_tunnel(struc | @@ -1686,14 +1699,14 @@ int vchiq_mmal_port_connect_tunnel(struc | ||||||
|  	/* set new format */ |  	/* set new format */ | ||||||
|  	ret = port_info_set(instance, dst); |  	ret = port_info_set(instance, dst); | ||||||
|  	if (ret) { |  	if (ret) { | ||||||
| @@ -277,7 +277,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  		goto release_unlock; |  		goto release_unlock; | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
| @@ -1701,9 +1714,9 @@ int vchiq_mmal_port_connect_tunnel(struc | @@ -1702,9 +1715,9 @@ int vchiq_mmal_port_connect_tunnel(struc | ||||||
|  				 MMAL_MSG_PORT_ACTION_TYPE_CONNECT, |  				 MMAL_MSG_PORT_ACTION_TYPE_CONNECT, | ||||||
|  				 dst->component->handle, dst->handle); |  				 dst->component->handle, dst->handle); | ||||||
|  	if (ret < 0) { |  	if (ret < 0) { | ||||||
| @@ -290,7 +290,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  		goto release_unlock; |  		goto release_unlock; | ||||||
|  	} |  	} | ||||||
|  	src->connected = dst; |  	src->connected = dst; | ||||||
| @@ -1728,7 +1741,8 @@ int vchiq_mmal_submit_buffer(struct vchi | @@ -1729,7 +1742,8 @@ int vchiq_mmal_submit_buffer(struct vchi | ||||||
|  	 * videobuf2 won't let us have the dmabuf there. |  	 * videobuf2 won't let us have the dmabuf there. | ||||||
|  	 */ |  	 */ | ||||||
|  	if (port->zero_copy && buffer->dma_buf && !buffer->vcsm_handle) { |  	if (port->zero_copy && buffer->dma_buf && !buffer->vcsm_handle) { | ||||||
| @@ -300,7 +300,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  		ret = vc_sm_cma_import_dmabuf(buffer->dma_buf, |  		ret = vc_sm_cma_import_dmabuf(buffer->dma_buf, | ||||||
|  					      &buffer->vcsm_handle); |  					      &buffer->vcsm_handle); | ||||||
|  		if (ret) { |  		if (ret) { | ||||||
| @@ -1744,8 +1758,8 @@ int vchiq_mmal_submit_buffer(struct vchi | @@ -1745,8 +1759,8 @@ int vchiq_mmal_submit_buffer(struct vchi | ||||||
|  			vc_sm_cma_free(buffer->vcsm_handle); |  			vc_sm_cma_free(buffer->vcsm_handle); | ||||||
|  			return ret; |  			return ret; | ||||||
|  		} |  		} | ||||||
| @@ -311,7 +311,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  	} |  	} | ||||||
|   |   | ||||||
|  	ret = buffer_from_host(instance, port, buffer); |  	ret = buffer_from_host(instance, port, buffer); | ||||||
| @@ -1784,8 +1798,8 @@ int mmal_vchi_buffer_cleanup(struct mmal | @@ -1785,8 +1799,8 @@ int mmal_vchi_buffer_cleanup(struct mmal | ||||||
|  	if (buf->vcsm_handle) { |  	if (buf->vcsm_handle) { | ||||||
|  		int ret; |  		int ret; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||||||
| +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | ||||||
| @@ -1500,6 +1500,8 @@ static int port_enable(struct vchiq_mmal | @@ -1501,6 +1501,8 @@ static int port_enable(struct vchiq_mmal | ||||||
|   |   | ||||||
|  	port->enabled = 1; |  	port->enabled = 1; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com> | |||||||
| +... | +... | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -17553,6 +17553,14 @@ F:	Documentation/devicetree/bindings/med | @@ -17560,6 +17560,14 @@ F:	Documentation/devicetree/bindings/med | ||||||
|  F:	Documentation/devicetree/bindings/media/i2c/imx477.yaml |  F:	Documentation/devicetree/bindings/media/i2c/imx477.yaml | ||||||
|  F:	drivers/media/i2c/imx477.c |  F:	drivers/media/i2c/imx477.c | ||||||
|   |   | ||||||
|   | |||||||
| @@ -46,7 +46,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> | |||||||
|  } |  } | ||||||
|  EXPORT_SYMBOL(drm_panel_init); |  EXPORT_SYMBOL(drm_panel_init); | ||||||
|   |   | ||||||
| @@ -289,16 +292,18 @@ int of_drm_get_panel_orientation(const s | @@ -294,16 +297,18 @@ int of_drm_get_panel_orientation(const s | ||||||
|  	if (ret < 0) |  	if (ret < 0) | ||||||
|  		return ret; |  		return ret; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com> | |||||||
|  |  | ||||||
| --- a/drivers/mmc/core/block.c | --- a/drivers/mmc/core/block.c | ||||||
| +++ b/drivers/mmc/core/block.c | +++ b/drivers/mmc/core/block.c | ||||||
| @@ -1930,7 +1930,11 @@ static void mmc_blk_mq_rw_recovery(struc | @@ -1932,7 +1932,11 @@ static void mmc_blk_mq_rw_recovery(struc | ||||||
|  		return; |  		return; | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|   | |||||||
| @@ -552,7 +552,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
| --- a/kernel/bounds.c | --- a/kernel/bounds.c | ||||||
| +++ b/kernel/bounds.c | +++ b/kernel/bounds.c | ||||||
| @@ -22,6 +22,11 @@ int main(void) | @@ -22,6 +22,11 @@ int main(void) | ||||||
|  	DEFINE(NR_CPUS_BITS, ilog2(CONFIG_NR_CPUS)); |  	DEFINE(NR_CPUS_BITS, bits_per(CONFIG_NR_CPUS)); | ||||||
|  #endif |  #endif | ||||||
|  	DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t)); |  	DEFINE(SPINLOCK_SIZE, sizeof(spinlock_t)); | ||||||
| +#ifdef CONFIG_LRU_GEN | +#ifdef CONFIG_LRU_GEN | ||||||
|   | |||||||
| @@ -1251,7 +1251,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  	get_scan_count(lruvec, sc, nr); |  	get_scan_count(lruvec, sc, nr); | ||||||
|   |   | ||||||
|  	/* Record the original scan target for proportional adjustments later */ |  	/* Record the original scan target for proportional adjustments later */ | ||||||
| @@ -3372,6 +4142,9 @@ static void snapshot_refaults(struct mem | @@ -3375,6 +4145,9 @@ static void snapshot_refaults(struct mem | ||||||
|  	struct lruvec *target_lruvec; |  	struct lruvec *target_lruvec; | ||||||
|  	unsigned long refaults; |  	unsigned long refaults; | ||||||
|   |   | ||||||
| @@ -1261,7 +1261,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  	target_lruvec = mem_cgroup_lruvec(target_memcg, pgdat); |  	target_lruvec = mem_cgroup_lruvec(target_memcg, pgdat); | ||||||
|  	refaults = lruvec_page_state(target_lruvec, WORKINGSET_ACTIVATE_ANON); |  	refaults = lruvec_page_state(target_lruvec, WORKINGSET_ACTIVATE_ANON); | ||||||
|  	target_lruvec->refaults[0] = refaults; |  	target_lruvec->refaults[0] = refaults; | ||||||
| @@ -3736,12 +4509,16 @@ unsigned long try_to_free_mem_cgroup_pag | @@ -3739,12 +4512,16 @@ unsigned long try_to_free_mem_cgroup_pag | ||||||
|  } |  } | ||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
| @@ -1280,7 +1280,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  	if (!can_age_anon_pages(pgdat, sc)) |  	if (!can_age_anon_pages(pgdat, sc)) | ||||||
|  		return; |  		return; | ||||||
|   |   | ||||||
| @@ -4058,12 +4835,11 @@ restart: | @@ -4061,12 +4838,11 @@ restart: | ||||||
|  		sc.may_swap = !nr_boost_reclaim; |  		sc.may_swap = !nr_boost_reclaim; | ||||||
|   |   | ||||||
|  		/* |  		/* | ||||||
|   | |||||||
| @@ -149,7 +149,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  |  | ||||||
| --- a/fs/exec.c | --- a/fs/exec.c | ||||||
| +++ b/fs/exec.c | +++ b/fs/exec.c | ||||||
| @@ -1013,6 +1013,7 @@ static int exec_mmap(struct mm_struct *m | @@ -1014,6 +1014,7 @@ static int exec_mmap(struct mm_struct *m | ||||||
|  	active_mm = tsk->active_mm; |  	active_mm = tsk->active_mm; | ||||||
|  	tsk->active_mm = mm; |  	tsk->active_mm = mm; | ||||||
|  	tsk->mm = mm; |  	tsk->mm = mm; | ||||||
| @@ -157,7 +157,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  	/* |  	/* | ||||||
|  	 * This prevents preemption while active_mm is being loaded and |  	 * This prevents preemption while active_mm is being loaded and | ||||||
|  	 * it and mm are being updated, which could cause problems for |  	 * it and mm are being updated, which could cause problems for | ||||||
| @@ -1028,6 +1029,7 @@ static int exec_mmap(struct mm_struct *m | @@ -1029,6 +1030,7 @@ static int exec_mmap(struct mm_struct *m | ||||||
|  	tsk->mm->vmacache_seqnum = 0; |  	tsk->mm->vmacache_seqnum = 0; | ||||||
|  	vmacache_flush(tsk); |  	vmacache_flush(tsk); | ||||||
|  	task_unlock(tsk); |  	task_unlock(tsk); | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  |  | ||||||
| --- a/fs/exec.c | --- a/fs/exec.c | ||||||
| +++ b/fs/exec.c | +++ b/fs/exec.c | ||||||
| @@ -1013,7 +1013,6 @@ static int exec_mmap(struct mm_struct *m | @@ -1014,7 +1014,6 @@ static int exec_mmap(struct mm_struct *m | ||||||
|  	active_mm = tsk->active_mm; |  	active_mm = tsk->active_mm; | ||||||
|  	tsk->active_mm = mm; |  	tsk->active_mm = mm; | ||||||
|  	tsk->mm = mm; |  	tsk->mm = mm; | ||||||
| @@ -39,7 +39,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  	/* |  	/* | ||||||
|  	 * This prevents preemption while active_mm is being loaded and |  	 * This prevents preemption while active_mm is being loaded and | ||||||
|  	 * it and mm are being updated, which could cause problems for |  	 * it and mm are being updated, which could cause problems for | ||||||
| @@ -1028,6 +1027,7 @@ static int exec_mmap(struct mm_struct *m | @@ -1029,6 +1028,7 @@ static int exec_mmap(struct mm_struct *m | ||||||
|  		local_irq_enable(); |  		local_irq_enable(); | ||||||
|  	tsk->mm->vmacache_seqnum = 0; |  	tsk->mm->vmacache_seqnum = 0; | ||||||
|  	vmacache_flush(tsk); |  	vmacache_flush(tsk); | ||||||
|   | |||||||
| @@ -354,7 +354,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> | |||||||
|  static void mem_cgroup_css_free(struct cgroup_subsys_state *css) |  static void mem_cgroup_css_free(struct cgroup_subsys_state *css) | ||||||
| --- a/mm/page_alloc.c | --- a/mm/page_alloc.c | ||||||
| +++ b/mm/page_alloc.c | +++ b/mm/page_alloc.c | ||||||
| @@ -7661,6 +7661,7 @@ static void __init free_area_init_node(i | @@ -7663,6 +7663,7 @@ static void __init free_area_init_node(i | ||||||
|  	pgdat_set_deferred_range(pgdat); |  	pgdat_set_deferred_range(pgdat); | ||||||
|   |   | ||||||
|  	free_area_init_core(pgdat); |  	free_area_init_core(pgdat); | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -11783,6 +11783,14 @@ L:	netdev@vger.kernel.org | @@ -11790,6 +11790,14 @@ L:	netdev@vger.kernel.org | ||||||
|  S:	Maintained |  S:	Maintained | ||||||
|  F:	drivers/net/ethernet/mediatek/ |  F:	drivers/net/ethernet/mediatek/ | ||||||
|   |   | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -11895,6 +11895,7 @@ M:	Landen Chao <Landen.Chao@mediatek.com | @@ -11902,6 +11902,7 @@ M:	Landen Chao <Landen.Chao@mediatek.com | ||||||
|  M:	DENG Qingfang <dqfext@gmail.com> |  M:	DENG Qingfang <dqfext@gmail.com> | ||||||
|  L:	netdev@vger.kernel.org |  L:	netdev@vger.kernel.org | ||||||
|  S:	Maintained |  S:	Maintained | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -11893,9 +11893,11 @@ MEDIATEK SWITCH DRIVER | @@ -11900,9 +11900,11 @@ MEDIATEK SWITCH DRIVER | ||||||
|  M:	Sean Wang <sean.wang@mediatek.com> |  M:	Sean Wang <sean.wang@mediatek.com> | ||||||
|  M:	Landen Chao <Landen.Chao@mediatek.com> |  M:	Landen Chao <Landen.Chao@mediatek.com> | ||||||
|  M:	DENG Qingfang <dqfext@gmail.com> |  M:	DENG Qingfang <dqfext@gmail.com> | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -12694,6 +12694,7 @@ F:	include/uapi/linux/meye.h | @@ -12701,6 +12701,7 @@ F:	include/uapi/linux/meye.h | ||||||
|   |   | ||||||
|  MOTORCOMM PHY DRIVER |  MOTORCOMM PHY DRIVER | ||||||
|  M:	Peter Geis <pgwipeout@gmail.com> |  M:	Peter Geis <pgwipeout@gmail.com> | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -17959,6 +17959,11 @@ L:	netdev@vger.kernel.org | @@ -17966,6 +17966,11 @@ L:	netdev@vger.kernel.org | ||||||
|  S:	Maintained |  S:	Maintained | ||||||
|  F:	drivers/net/ethernet/dlink/sundance.c |  F:	drivers/net/ethernet/dlink/sundance.c | ||||||
|   |   | ||||||
|   | |||||||
| @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -12358,6 +12358,14 @@ S:	Supported | @@ -12365,6 +12365,14 @@ S:	Supported | ||||||
|  F:	Documentation/devicetree/bindings/mtd/atmel-nand.txt |  F:	Documentation/devicetree/bindings/mtd/atmel-nand.txt | ||||||
|  F:	drivers/mtd/nand/raw/atmel/* |  F:	drivers/mtd/nand/raw/atmel/* | ||||||
|   |   | ||||||
|   | |||||||
| @@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |||||||
|  	imx_ocotp_nvmem_config.priv = priv; |  	imx_ocotp_nvmem_config.priv = priv; | ||||||
| --- a/drivers/nvmem/meson-efuse.c | --- a/drivers/nvmem/meson-efuse.c | ||||||
| +++ b/drivers/nvmem/meson-efuse.c | +++ b/drivers/nvmem/meson-efuse.c | ||||||
| @@ -93,6 +93,7 @@ static int meson_efuse_probe(struct plat | @@ -74,6 +74,7 @@ static int meson_efuse_probe(struct plat | ||||||
|   |   | ||||||
|  	econfig->dev = dev; |  	econfig->dev = dev; | ||||||
|  	econfig->name = dev_name(dev); |  	econfig->name = dev_name(dev); | ||||||
|   | |||||||
| @@ -4253,6 +4253,7 @@ CONFIG_NEW_LEDS=y | |||||||
| # CONFIG_NFC is not set | # CONFIG_NFC is not set | ||||||
| # CONFIG_NFP is not set | # CONFIG_NFP is not set | ||||||
| # CONFIG_NFSD is not set | # CONFIG_NFSD is not set | ||||||
|  | # CONFIG_NFSD_V2 is not set | ||||||
| # CONFIG_NFSD_V2_ACL is not set | # CONFIG_NFSD_V2_ACL is not set | ||||||
| CONFIG_NFSD_V3=y | CONFIG_NFSD_V3=y | ||||||
| # CONFIG_NFSD_V3_ACL is not set | # CONFIG_NFSD_V3_ACL is not set | ||||||
|   | |||||||
| @@ -27,8 +27,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
| +#define SYMTAB_DISCARD_GPL | +#define SYMTAB_DISCARD_GPL | ||||||
| +#endif | +#endif | ||||||
| + | + | ||||||
|  /* Align . to a 8 byte boundary equals to maximum function alignment. */ |  /* Align . function alignment. */ | ||||||
|  #define ALIGN_FUNCTION()  . = ALIGN(8) |  #define ALIGN_FUNCTION()  . = ALIGN(CONFIG_FUNCTION_ALIGNMENT) | ||||||
|   |   | ||||||
| @@ -485,14 +495,14 @@ | @@ -485,14 +495,14 @@ | ||||||
|  	/* Kernel symbol table: Normal symbols */			\ |  	/* Kernel symbol table: Normal symbols */			\ | ||||||
|   | |||||||
| @@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support | |||||||
|   |   | ||||||
|  #define QUECTEL_VENDOR_ID			0x2c7c |  #define QUECTEL_VENDOR_ID			0x2c7c | ||||||
|  /* These Quectel products use Quectel's vendor ID */ |  /* These Quectel products use Quectel's vendor ID */ | ||||||
| @@ -1147,6 +1152,11 @@ static const struct usb_device_id option | @@ -1152,6 +1157,11 @@ static const struct usb_device_id option | ||||||
|  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ |  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ | ||||||
|  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */ |  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */ | ||||||
|  	  .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) }, |  	  .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) }, | ||||||
| @@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support | |||||||
|  	/* Quectel products using Qualcomm vendor ID */ |  	/* Quectel products using Qualcomm vendor ID */ | ||||||
|  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, |  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, | ||||||
|  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), |  	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), | ||||||
| @@ -1188,6 +1198,11 @@ static const struct usb_device_id option | @@ -1193,6 +1203,11 @@ static const struct usb_device_id option | ||||||
|  	  .driver_info = ZLP }, |  	  .driver_info = ZLP }, | ||||||
|  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), |  	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), | ||||||
|  	  .driver_info = RSVD(4) }, |  	  .driver_info = RSVD(4) }, | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/fs/locks.c | --- a/fs/locks.c | ||||||
| +++ b/fs/locks.c | +++ b/fs/locks.c | ||||||
| @@ -2953,6 +2953,8 @@ static const struct seq_operations locks | @@ -3008,6 +3008,8 @@ static const struct seq_operations locks | ||||||
|   |   | ||||||
|  static int __init proc_locks_init(void) |  static int __init proc_locks_init(void) | ||||||
|  { |  { | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> | |||||||
|  |  | ||||||
| --- a/drivers/base/core.c | --- a/drivers/base/core.c | ||||||
| +++ b/drivers/base/core.c | +++ b/drivers/base/core.c | ||||||
| @@ -1562,7 +1562,7 @@ static void device_links_purge(struct de | @@ -1577,7 +1577,7 @@ static void device_links_purge(struct de | ||||||
|  #define FW_DEVLINK_FLAGS_RPM		(FW_DEVLINK_FLAGS_ON | \ |  #define FW_DEVLINK_FLAGS_RPM		(FW_DEVLINK_FLAGS_ON | \ | ||||||
|  					 DL_FLAG_PM_RUNTIME) |  					 DL_FLAG_PM_RUNTIME) | ||||||
|   |   | ||||||
|   | |||||||
| @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de> | |||||||
|  |  | ||||||
| --- a/mm/page_alloc.c | --- a/mm/page_alloc.c | ||||||
| +++ b/mm/page_alloc.c | +++ b/mm/page_alloc.c | ||||||
| @@ -7620,7 +7620,7 @@ static void __init alloc_node_mem_map(st | @@ -7622,7 +7622,7 @@ static void __init alloc_node_mem_map(st | ||||||
|  	if (pgdat == NODE_DATA(0)) { |  	if (pgdat == NODE_DATA(0)) { | ||||||
|  		mem_map = NODE_DATA(0)->node_mem_map; |  		mem_map = NODE_DATA(0)->node_mem_map; | ||||||
|  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn) |  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn) | ||||||
|   | |||||||
| @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  		for (i = sizeof(struct ipt_entry); |  		for (i = sizeof(struct ipt_entry); | ||||||
|  		     i < e->target_offset; |  		     i < e->target_offset; | ||||||
|  		     i += m->u.match_size) { |  		     i += m->u.match_size) { | ||||||
| @@ -1222,12 +1259,15 @@ compat_copy_entry_to_user(struct ipt_ent | @@ -1224,12 +1261,15 @@ compat_copy_entry_to_user(struct ipt_ent | ||||||
|  	compat_uint_t origsize; |  	compat_uint_t origsize; | ||||||
|  	const struct xt_entry_match *ematch; |  	const struct xt_entry_match *ematch; | ||||||
|  	int ret = 0; |  	int ret = 0; | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/net/netfilter/nf_tables_api.c | --- a/net/netfilter/nf_tables_api.c | ||||||
| +++ b/net/netfilter/nf_tables_api.c | +++ b/net/netfilter/nf_tables_api.c | ||||||
| @@ -7770,7 +7770,7 @@ static int nft_register_flowtable_net_ho | @@ -7803,7 +7803,7 @@ static int nft_register_flowtable_net_ho | ||||||
|  		err = flowtable->data.type->setup(&flowtable->data, |  		err = flowtable->data.type->setup(&flowtable->data, | ||||||
|  						  hook->ops.dev, |  						  hook->ops.dev, | ||||||
|  						  FLOW_BLOCK_BIND); |  						  FLOW_BLOCK_BIND); | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: Alexander Duyck <alexanderduyck@fb.com> | |||||||
|  |  | ||||||
| --- a/net/core/skbuff.c | --- a/net/core/skbuff.c | ||||||
| +++ b/net/core/skbuff.c | +++ b/net/core/skbuff.c | ||||||
| @@ -4359,6 +4359,15 @@ int skb_gro_receive(struct sk_buff *p, s | @@ -4360,6 +4360,15 @@ int skb_gro_receive(struct sk_buff *p, s | ||||||
|  	if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush)) |  	if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush)) | ||||||
|  		return -E2BIG; |  		return -E2BIG; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -25,7 +25,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> | |||||||
|   |   | ||||||
| --- a/drivers/pci/quirks.c | --- a/drivers/pci/quirks.c | ||||||
| +++ b/drivers/pci/quirks.c | +++ b/drivers/pci/quirks.c | ||||||
| @@ -206,6 +206,7 @@ static void quirk_mmio_always_on(struct | @@ -207,6 +207,7 @@ static void quirk_mmio_always_on(struct | ||||||
|  DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, |  DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, | ||||||
|  				PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on); |  				PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on); | ||||||
|   |   | ||||||
| @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> | |||||||
|  /* |  /* | ||||||
|   * The Mellanox Tavor device gives false positive parity errors.  Disable |   * The Mellanox Tavor device gives false positive parity errors.  Disable | ||||||
|   * parity error reporting. |   * parity error reporting. | ||||||
| @@ -3368,6 +3369,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I | @@ -3369,6 +3370,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I | ||||||
|  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); |  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); | ||||||
|  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); |  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); | ||||||
|   |   | ||||||
| @@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> | |||||||
|  /* |  /* | ||||||
|   * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. |   * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. | ||||||
|   * To work around this, query the size it should be configured to by the |   * To work around this, query the size it should be configured to by the | ||||||
| @@ -3393,6 +3396,8 @@ static void quirk_intel_ntb(struct pci_d | @@ -3394,6 +3397,8 @@ static void quirk_intel_ntb(struct pci_d | ||||||
|  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); |  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); | ||||||
|  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); |  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); | ||||||
|   |   | ||||||
| @@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> | |||||||
|  /* |  /* | ||||||
|   * Some BIOS implementations leave the Intel GPU interrupts enabled, even |   * Some BIOS implementations leave the Intel GPU interrupts enabled, even | ||||||
|   * though no one is handling them (e.g., if the i915 driver is never |   * though no one is handling them (e.g., if the i915 driver is never | ||||||
| @@ -3431,6 +3436,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN | @@ -3432,6 +3437,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN | ||||||
|  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); |  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); | ||||||
|  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); |  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-5-robimarko@gmail.com | |||||||
|  |  | ||||||
| --- a/drivers/clk/qcom/gcc-ipq8074.c | --- a/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| +++ b/drivers/clk/qcom/gcc-ipq8074.c | +++ b/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| @@ -3177,6 +3177,24 @@ static struct clk_branch gcc_nss_ptp_ref | @@ -3179,6 +3179,24 @@ static struct clk_branch gcc_nss_ptp_ref | ||||||
|  	}, |  	}, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -42,7 +42,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-5-robimarko@gmail.com | |||||||
|  static struct clk_branch gcc_nssnoc_ce_apb_clk = { |  static struct clk_branch gcc_nssnoc_ce_apb_clk = { | ||||||
|  	.halt_reg = 0x6830c, |  	.halt_reg = 0x6830c, | ||||||
|  	.clkr = { |  	.clkr = { | ||||||
| @@ -4649,6 +4667,7 @@ static struct clk_regmap *gcc_ipq8074_cl | @@ -4651,6 +4669,7 @@ static struct clk_regmap *gcc_ipq8074_cl | ||||||
|  	[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr, |  	[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr, | ||||||
|  	[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr, |  	[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr, | ||||||
|  	[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr, |  	[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr, | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com | |||||||
|  #include "reset.h" |  #include "reset.h" | ||||||
|   |   | ||||||
|  enum { |  enum { | ||||||
| @@ -4402,6 +4403,22 @@ static struct clk_branch gcc_pcie0_axi_s | @@ -4404,6 +4405,22 @@ static struct clk_branch gcc_pcie0_axi_s | ||||||
|  	}, |  	}, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -56,7 +56,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com | |||||||
|  static const struct alpha_pll_config ubi32_pll_config = { |  static const struct alpha_pll_config ubi32_pll_config = { | ||||||
|  	.l = 0x4e, |  	.l = 0x4e, | ||||||
|  	.config_ctl_val = 0x200d4aa8, |  	.config_ctl_val = 0x200d4aa8, | ||||||
| @@ -4805,6 +4822,11 @@ static const struct qcom_reset_map gcc_i | @@ -4807,6 +4824,11 @@ static const struct qcom_reset_map gcc_i | ||||||
|  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, |  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -68,7 +68,7 @@ Link: https://lore.kernel.org/r/20220515210048.483898-9-robimarko@gmail.com | |||||||
|  static const struct of_device_id gcc_ipq8074_match_table[] = { |  static const struct of_device_id gcc_ipq8074_match_table[] = { | ||||||
|  	{ .compatible = "qcom,gcc-ipq8074" }, |  	{ .compatible = "qcom,gcc-ipq8074" }, | ||||||
|  	{ } |  	{ } | ||||||
| @@ -4827,6 +4849,8 @@ static const struct qcom_cc_desc gcc_ipq | @@ -4829,6 +4851,8 @@ static const struct qcom_cc_desc gcc_ipq | ||||||
|  	.num_resets = ARRAY_SIZE(gcc_ipq8074_resets), |  	.num_resets = ARRAY_SIZE(gcc_ipq8074_resets), | ||||||
|  	.clk_hws = gcc_ipq8074_hws, |  	.clk_hws = gcc_ipq8074_hws, | ||||||
|  	.num_clk_hws = ARRAY_SIZE(gcc_ipq8074_hws), |  	.num_clk_hws = ARRAY_SIZE(gcc_ipq8074_hws), | ||||||
|   | |||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -18,7 +18,7 @@ Link: https://lore.kernel.org/r/20221107132901.489240-3-robimarko@gmail.com | |||||||
|  |  | ||||||
| --- a/drivers/clk/qcom/gcc-ipq8074.c | --- a/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| +++ b/drivers/clk/qcom/gcc-ipq8074.c | +++ b/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| @@ -4665,6 +4665,20 @@ static const struct qcom_reset_map gcc_i | @@ -4667,6 +4667,20 @@ static const struct qcom_reset_map gcc_i | ||||||
|  	[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 }, |  	[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 }, | ||||||
|  	[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 }, |  	[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 }, | ||||||
|  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, |  	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 }, | ||||||
|   | |||||||
| @@ -22,7 +22,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  |  | ||||||
| --- a/drivers/clk/qcom/gcc-ipq8074.c | --- a/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| +++ b/drivers/clk/qcom/gcc-ipq8074.c | +++ b/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| @@ -674,7 +674,7 @@ static struct clk_rcg2 pcie0_aux_clk_src | @@ -675,7 +675,7 @@ static struct clk_rcg2 pcie0_aux_clk_src | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_pcie20_phy0_pipe_clk_xo[] = { |  static const struct clk_parent_data gcc_pcie20_phy0_pipe_clk_xo[] = { | ||||||
| @@ -31,7 +31,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -727,7 +727,7 @@ static struct clk_rcg2 pcie1_aux_clk_src | @@ -728,7 +728,7 @@ static struct clk_rcg2 pcie1_aux_clk_src | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_pcie20_phy1_pipe_clk_xo[] = { |  static const struct clk_parent_data gcc_pcie20_phy1_pipe_clk_xo[] = { | ||||||
| @@ -40,7 +40,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -1131,7 +1131,7 @@ static const struct freq_tbl ftbl_nss_no | @@ -1133,7 +1133,7 @@ static const struct freq_tbl ftbl_nss_no | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_xo_bias_pll_nss_noc_clk_gpll0_gpll2[] = { |  static const struct clk_parent_data gcc_xo_bias_pll_nss_noc_clk_gpll0_gpll2[] = { | ||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
| @@ -49,7 +49,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  	{ .hw = &gpll0.clkr.hw }, |  	{ .hw = &gpll0.clkr.hw }, | ||||||
|  	{ .hw = &gpll2.clkr.hw }, |  	{ .hw = &gpll2.clkr.hw }, | ||||||
|  }; |  }; | ||||||
| @@ -1356,7 +1356,7 @@ static const struct freq_tbl ftbl_nss_pp | @@ -1358,7 +1358,7 @@ static const struct freq_tbl ftbl_nss_pp | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_xo_bias_gpll0_gpll4_nss_ubi32[] = { |  static const struct clk_parent_data gcc_xo_bias_gpll0_gpll4_nss_ubi32[] = { | ||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
| @@ -58,7 +58,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  	{ .hw = &gpll0.clkr.hw }, |  	{ .hw = &gpll0.clkr.hw }, | ||||||
|  	{ .hw = &gpll4.clkr.hw }, |  	{ .hw = &gpll4.clkr.hw }, | ||||||
|  	{ .hw = &nss_crypto_pll.clkr.hw }, |  	{ .hw = &nss_crypto_pll.clkr.hw }, | ||||||
| @@ -1407,10 +1407,10 @@ static const struct freq_tbl ftbl_nss_po | @@ -1409,10 +1409,10 @@ static const struct freq_tbl ftbl_nss_po | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_ubi32_bias[] = { |  static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_ubi32_bias[] = { | ||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
| @@ -72,7 +72,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct parent_map gcc_xo_uniphy0_rx_tx_ubi32_bias_map[] = { |  static const struct parent_map gcc_xo_uniphy0_rx_tx_ubi32_bias_map[] = { | ||||||
| @@ -1459,10 +1459,10 @@ static const struct freq_tbl ftbl_nss_po | @@ -1461,10 +1461,10 @@ static const struct freq_tbl ftbl_nss_po | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_ubi32_bias[] = { |  static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_ubi32_bias[] = { | ||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
| @@ -86,7 +86,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = { |  static const struct parent_map gcc_xo_uniphy0_tx_rx_ubi32_bias_map[] = { | ||||||
| @@ -1690,12 +1690,12 @@ static const struct freq_tbl ftbl_nss_po | @@ -1692,12 +1692,12 @@ static const struct freq_tbl ftbl_nss_po | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias[] = { |  static const struct clk_parent_data gcc_xo_uniphy0_rx_tx_uniphy1_rx_tx_ubi32_bias[] = { | ||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
| @@ -104,7 +104,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct parent_map |  static const struct parent_map | ||||||
| @@ -1752,12 +1752,12 @@ static const struct freq_tbl ftbl_nss_po | @@ -1754,12 +1754,12 @@ static const struct freq_tbl ftbl_nss_po | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_uniphy1_tx_rx_ubi32_bias[] = { |  static const struct clk_parent_data gcc_xo_uniphy0_tx_rx_uniphy1_tx_rx_ubi32_bias[] = { | ||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
| @@ -122,7 +122,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct parent_map |  static const struct parent_map | ||||||
| @@ -1814,10 +1814,10 @@ static const struct freq_tbl ftbl_nss_po | @@ -1816,10 +1816,10 @@ static const struct freq_tbl ftbl_nss_po | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_xo_uniphy2_rx_tx_ubi32_bias[] = { |  static const struct clk_parent_data gcc_xo_uniphy2_rx_tx_ubi32_bias[] = { | ||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
| @@ -136,7 +136,7 @@ Link: https://lore.kernel.org/r/20221116214655.1116467-1-robimarko@gmail.com | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct parent_map gcc_xo_uniphy2_rx_tx_ubi32_bias_map[] = { |  static const struct parent_map gcc_xo_uniphy2_rx_tx_ubi32_bias_map[] = { | ||||||
| @@ -1871,10 +1871,10 @@ static const struct freq_tbl ftbl_nss_po | @@ -1873,10 +1873,10 @@ static const struct freq_tbl ftbl_nss_po | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_xo_uniphy2_tx_rx_ubi32_bias[] = { |  static const struct clk_parent_data gcc_xo_uniphy2_tx_rx_ubi32_bias[] = { | ||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
|   | |||||||
| @@ -23,7 +23,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> | |||||||
|  |  | ||||||
| --- a/drivers/clk/qcom/gcc-ipq8074.c | --- a/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| +++ b/drivers/clk/qcom/gcc-ipq8074.c | +++ b/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| @@ -1676,13 +1676,21 @@ static struct clk_regmap_div nss_port4_t | @@ -1678,13 +1678,21 @@ static struct clk_regmap_div nss_port4_t | ||||||
|  	}, |  	}, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -49,7 +49,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> | |||||||
|  	F(156250000, P_UNIPHY1_RX, 2, 0, 0), |  	F(156250000, P_UNIPHY1_RX, 2, 0, 0), | ||||||
|  	F(312500000, P_UNIPHY1_RX, 1, 0, 0), |  	F(312500000, P_UNIPHY1_RX, 1, 0, 0), | ||||||
|  	{ } |  	{ } | ||||||
| @@ -1738,13 +1746,21 @@ static struct clk_regmap_div nss_port5_r | @@ -1740,13 +1748,21 @@ static struct clk_regmap_div nss_port5_r | ||||||
|  	}, |  	}, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -75,7 +75,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> | |||||||
|  	F(156250000, P_UNIPHY1_TX, 2, 0, 0), |  	F(156250000, P_UNIPHY1_TX, 2, 0, 0), | ||||||
|  	F(312500000, P_UNIPHY1_TX, 1, 0, 0), |  	F(312500000, P_UNIPHY1_TX, 1, 0, 0), | ||||||
|  	{ } |  	{ } | ||||||
| @@ -1800,13 +1816,21 @@ static struct clk_regmap_div nss_port5_t | @@ -1802,13 +1818,21 @@ static struct clk_regmap_div nss_port5_t | ||||||
|  	}, |  	}, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -101,7 +101,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> | |||||||
|  	F(156250000, P_UNIPHY2_RX, 2, 0, 0), |  	F(156250000, P_UNIPHY2_RX, 2, 0, 0), | ||||||
|  	F(312500000, P_UNIPHY2_RX, 1, 0, 0), |  	F(312500000, P_UNIPHY2_RX, 1, 0, 0), | ||||||
|  	{ } |  	{ } | ||||||
| @@ -1857,13 +1881,21 @@ static struct clk_regmap_div nss_port6_r | @@ -1859,13 +1883,21 @@ static struct clk_regmap_div nss_port6_r | ||||||
|  	}, |  	}, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <sboyd@kernel.org> | |||||||
|  |  | ||||||
| --- a/drivers/clk/qcom/gcc-ipq8074.c | --- a/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| +++ b/drivers/clk/qcom/gcc-ipq8074.c | +++ b/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| @@ -4711,6 +4711,7 @@ static const struct qcom_reset_map gcc_i | @@ -4713,6 +4713,7 @@ static const struct qcom_reset_map gcc_i | ||||||
|  	[GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = BIT(27) | GENMASK(9, 8) }, |  	[GCC_NSSPORT4_RESET] = { .reg = 0x68014, .bitmask = BIT(27) | GENMASK(9, 8) }, | ||||||
|  	[GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = BIT(28) | GENMASK(11, 10) }, |  	[GCC_NSSPORT5_RESET] = { .reg = 0x68014, .bitmask = BIT(28) | GENMASK(11, 10) }, | ||||||
|  	[GCC_NSSPORT6_RESET] = { .reg = 0x68014, .bitmask = BIT(29) | GENMASK(13, 12) }, |  	[GCC_NSSPORT6_RESET] = { .reg = 0x68014, .bitmask = BIT(29) | GENMASK(13, 12) }, | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> | |||||||
|  |  | ||||||
| --- a/drivers/clk/qcom/gcc-ipq8074.c | --- a/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| +++ b/drivers/clk/qcom/gcc-ipq8074.c | +++ b/drivers/clk/qcom/gcc-ipq8074.c | ||||||
| @@ -928,7 +928,7 @@ static struct clk_rcg2 usb0_mock_utmi_cl | @@ -930,7 +930,7 @@ static struct clk_rcg2 usb0_mock_utmi_cl | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_usb3phy_0_cc_pipe_clk_xo[] = { |  static const struct clk_parent_data gcc_usb3phy_0_cc_pipe_clk_xo[] = { | ||||||
| @@ -27,7 +27,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com> | |||||||
|  	{ .fw_name = "xo", .name = "xo" }, |  	{ .fw_name = "xo", .name = "xo" }, | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
| @@ -996,7 +996,7 @@ static struct clk_rcg2 usb1_mock_utmi_cl | @@ -998,7 +998,7 @@ static struct clk_rcg2 usb1_mock_utmi_cl | ||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  static const struct clk_parent_data gcc_usb3phy_1_cc_pipe_clk_xo[] = { |  static const struct clk_parent_data gcc_usb3phy_1_cc_pipe_clk_xo[] = { | ||||||
|   | |||||||
| @@ -5479,7 +5479,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org> | |||||||
|  	  (transaction layer end-to-end CRC checking). |  	  (transaction layer end-to-end CRC checking). | ||||||
| --- a/include/linux/pci.h | --- a/include/linux/pci.h | ||||||
| +++ b/include/linux/pci.h | +++ b/include/linux/pci.h | ||||||
| @@ -1482,6 +1482,8 @@ void pci_walk_bus(struct pci_bus *top, i | @@ -1483,6 +1483,8 @@ void pci_walk_bus(struct pci_bus *top, i | ||||||
|  		  void *userdata); |  		  void *userdata); | ||||||
|  int pci_cfg_space_size(struct pci_dev *dev); |  int pci_cfg_space_size(struct pci_dev *dev); | ||||||
|  unsigned char pci_bus_max_busnr(struct pci_bus *bus); |  unsigned char pci_bus_max_busnr(struct pci_bus *bus); | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ | |||||||
|  	}, |  	}, | ||||||
|  	[PORT_NPCM] = { |  	[PORT_NPCM] = { | ||||||
|  		.name		= "Nuvoton 16550", |  		.name		= "Nuvoton 16550", | ||||||
| @@ -2752,6 +2752,11 @@ serial8250_do_set_termios(struct uart_po | @@ -2746,6 +2746,11 @@ serial8250_do_set_termios(struct uart_po | ||||||
|  	unsigned long flags; |  	unsigned long flags; | ||||||
|  	unsigned int baud, quot, frac = 0; |  	unsigned int baud, quot, frac = 0; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -11791,6 +11791,15 @@ S:	Maintained | @@ -11798,6 +11798,15 @@ S:	Maintained | ||||||
|  F:	drivers/net/pcs/pcs-mtk-lynxi.c |  F:	drivers/net/pcs/pcs-mtk-lynxi.c | ||||||
|  F:	include/linux/pcs/pcs-mtk-lynxi.h |  F:	include/linux/pcs/pcs-mtk-lynxi.h | ||||||
|   |   | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> | |||||||
|  |  | ||||||
| --- a/drivers/pci/quirks.c | --- a/drivers/pci/quirks.c | ||||||
| +++ b/drivers/pci/quirks.c | +++ b/drivers/pci/quirks.c | ||||||
| @@ -25,6 +25,7 @@ | @@ -26,6 +26,7 @@ | ||||||
|  #include <linux/ktime.h> |  #include <linux/ktime.h> | ||||||
|  #include <linux/mm.h> |  #include <linux/mm.h> | ||||||
|  #include <linux/nvme.h> |  #include <linux/nvme.h> | ||||||
| @@ -22,10 +22,10 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> | |||||||
|  #include <linux/platform_data/x86/apple.h> |  #include <linux/platform_data/x86/apple.h> | ||||||
|  #include <linux/pm_runtime.h> |  #include <linux/pm_runtime.h> | ||||||
|  #include <linux/suspend.h> |  #include <linux/suspend.h> | ||||||
| @@ -5900,3 +5901,34 @@ static void nvidia_ion_ahci_fixup(struct | @@ -6000,3 +6001,34 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I | ||||||
|  	pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING; |  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa73f, dpc_log_size); | ||||||
|  } |  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa76e, dpc_log_size); | ||||||
|  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup); |  #endif | ||||||
| + | + | ||||||
| +#ifdef CONFIG_PCI_HOST_THUNDER_PEM | +#ifdef CONFIG_PCI_HOST_THUNDER_PEM | ||||||
| +/* | +/* | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ Signed-off-by: Guenter Roeck <linux@roeck-us.net> | |||||||
|  |  | ||||||
| --- a/MAINTAINERS | --- a/MAINTAINERS | ||||||
| +++ b/MAINTAINERS | +++ b/MAINTAINERS | ||||||
| @@ -15896,6 +15896,13 @@ S:	Maintained | @@ -15903,6 +15903,13 @@ S:	Maintained | ||||||
|  F:	include/sound/rt*.h |  F:	include/sound/rt*.h | ||||||
|  F:	sound/soc/codecs/rt* |  F:	sound/soc/codecs/rt* | ||||||
|   |   | ||||||
|   | |||||||
| @@ -224,6 +224,7 @@ CONFIG_MICROCODE_AMD=y | |||||||
| CONFIG_MICROCODE_INTEL=y | CONFIG_MICROCODE_INTEL=y | ||||||
| CONFIG_MICROCODE_LATE_LOADING=y | CONFIG_MICROCODE_LATE_LOADING=y | ||||||
| CONFIG_MIGRATION=y | CONFIG_MIGRATION=y | ||||||
|  | CONFIG_MITIGATION_RFDS=y | ||||||
| # CONFIG_MK6 is not set | # CONFIG_MK6 is not set | ||||||
| # CONFIG_MK7 is not set | # CONFIG_MK7 is not set | ||||||
| # CONFIG_MK8 is not set | # CONFIG_MK8 is not set | ||||||
| @@ -327,6 +328,9 @@ CONFIG_SG_POOL=y | |||||||
| # CONFIG_SMSC_SCH311X_WDT is not set | # CONFIG_SMSC_SCH311X_WDT is not set | ||||||
| CONFIG_SPARSEMEM_STATIC=y | CONFIG_SPARSEMEM_STATIC=y | ||||||
| CONFIG_SPARSE_IRQ=y | CONFIG_SPARSE_IRQ=y | ||||||
|  | # CONFIG_SPECTRE_BHI_AUTO is not set | ||||||
|  | # CONFIG_SPECTRE_BHI_OFF is not set | ||||||
|  | CONFIG_SPECTRE_BHI_ON=y | ||||||
| CONFIG_SPECULATION_MITIGATIONS=y | CONFIG_SPECULATION_MITIGATIONS=y | ||||||
| CONFIG_SRCU=y | CONFIG_SRCU=y | ||||||
| # CONFIG_STATIC_CALL_SELFTEST is not set | # CONFIG_STATIC_CALL_SELFTEST is not set | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Hauke Mehrtens
					Hauke Mehrtens