linux-next: manual merge of the tty tree with the powerpc tree

linux-next: manual merge of the tty tree with the powerpc tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/8250.c between commit 7df5659eefad ("serial/8250: Move
UPIO_TSI to powerpc") from the powerpc tree and commit 4834d0289785
("tty: serial8250: remove UPIO_DWAPB{,32}") from the tty tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/tty/serial/8250.c
index 610b8e6,435ce14..0000000
--- a/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@@ -443,42 -443,24 +443,6 @@@ static void au_serial_out(struct uart_p
  	__raw_writel(value, p->membase + offset);
  }
  
- /* Save the LCR value so it can be re-written when a Busy Detect IRQ occurs. */
- static inline void dwapb_save_out_value(struct uart_port *p, int offset,
- 					int value)
- {
- 	struct uart_8250_port *up =
- 		container_of(p, struct uart_8250_port, port);
- 
- 	if (offset == UART_LCR)
- 		up->lcr = value;
- }
- 
- /* Read the IER to ensure any interrupt is cleared before returning from ISR. */
- static inline void dwapb_check_clear_ier(struct uart_port *p, int offset)
- {
- 	if (offset == UART_TX || offset == UART_IER)
- 		p->serial_in(p, UART_IER);
- }
- 
- static void dwapb_serial_out(struct uart_port *p, int offset, int value)
- {
- 	int save_offset = offset;
- 	offset = map_8250_out_reg(p, offset) << p->regshift;
- 	dwapb_save_out_value(p, save_offset, value);
- 	writeb(value, p->membase + offset);
- 	dwapb_check_clear_ier(p, save_offset);
- }
- 
- static void dwapb32_serial_out(struct uart_port *p, int offset, int value)
- {
- 	int save_offset = offset;
- 	offset = map_8250_out_reg(p, offset) << p->regshift;
- 	dwapb_save_out_value(p, save_offset, value);
- 	writel(value, p->membase + offset);
- 	dwapb_check_clear_ier(p, save_offset);
- }
- 
 -static unsigned int tsi_serial_in(struct uart_port *p, int offset)
 -{
 -	unsigned int tmp;
 -	offset = map_8250_in_reg(p, offset) << p->regshift;
 -	if (offset == UART_IIR) {
 -		tmp = readl(p->membase + (UART_IIR & ~3));
 -		return (tmp >> 16) & 0xff; /* UART_IIR % 4 == 2 */
 -	} else
 -		return readb(p->membase + offset);
 -}
 -
 -static void tsi_serial_out(struct uart_port *p, int offset, int value)
 -{
 -	offset = map_8250_out_reg(p, offset) << p->regshift;
 -	if (!((offset == UART_IER) && (value & UART_IER_UUE)))
 -		writeb(value, p->membase + offset);
 -}
 -
  static unsigned int io_serial_in(struct uart_port *p, int offset)
  {
  	offset = map_8250_in_reg(p, offset) << p->regshift;
@@@ -517,16 -501,11 +483,6 @@@ static void set_io_from_upio(struct uar
  		p->serial_out = au_serial_out;
  		break;
  
- 	case UPIO_DWAPB:
- 		p->serial_in = mem_serial_in;
- 		p->serial_out = dwapb_serial_out;
- 		break;
- 
- 	case UPIO_DWAPB32:
- 		p->serial_in = mem32_serial_in;
- 		p->serial_out = dwapb32_serial_out;
- 		break;
- 
 -	case UPIO_TSI:
 -		p->serial_in = tsi_serial_in;
 -		p->serial_out = tsi_serial_out;
 -		break;
 -
  	default:
  		p->serial_in = io_serial_in;
  		p->serial_out = io_serial_out;

linux-next: manual merge of the tty tree with the powerpc tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the tty tree got conflicts in
arch/powerpc/include/asm/udbg.h and arch/powerpc/kernel/udbg.c between
commit c26afe9e8591 ("powerpc/ps3: Add gelic udbg driver") from the
powerpc tree and commit dcd83aaff1c8 ("tty/powerpc: introduce the ePAPR
embedded hypervisor byte channel driver") from the tty tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/powerpc/include/asm/udbg.h
index 6587ec7,5354ae9..0000000
--- a/arch/powerpc/include/asm/udbg.h
+++ b/arch/powerpc/include/asm/udbg.h
@@@ -54,9 -54,7 +54,10 @@@ extern void __init udbg_init_40x_realmo
  extern void __init udbg_init_cpm(void);
  extern void __init udbg_init_usbgecko(void);
  extern void __init udbg_init_wsp(void);
 +extern void __init udbg_init_ps3gelic(void);
 +extern void __init udbg_init_debug_opal_raw(void);
 +extern void __init udbg_init_debug_opal_hvsi(void);
+ extern void __init udbg_init_ehv_bc(void);
  
  #endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_UDBG_H */
diff --cc arch/powerpc/kernel/udbg.c
index 35f9482,b4607a9..0000000
--- a/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@@ -67,12 -67,8 +67,14 @@@ void __init udbg_early_init(void
  	udbg_init_usbgecko();
  #elif defined(CONFIG_PPC_EARLY_DEBUG_WSP)
  	udbg_init_wsp();
 +#elif defined(CONFIG_PPC_EARLY_DEBUG_PS3GELIC)
 +	udbg_init_ps3gelic();
 +#elif defined(CONFIG_PPC_EARLY_DEBUG_OPAL_RAW)
 +	udbg_init_debug_opal_raw();
 +#elif defined(CONFIG_PPC_EARLY_DEBUG_OPAL_HVSI)
 +	udbg_init_debug_opal_hvsi();
+ #elif defined(CONFIG_PPC_EARLY_DEBUG_EHV_BC)
+ 	udbg_init_ehv_bc();
  #endif
  
  #ifdef CONFIG_PPC_EARLY_DEBUG

Re: linux-next: manual merge of the tty tree with the powerpc tree

[Greg KH]

On Wed, Sep 21, 2011 at 03:01:21PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got conflicts in
> arch/powerpc/include/asm/udbg.h and arch/powerpc/kernel/udbg.c between
> commit c26afe9e8591 ("powerpc/ps3: Add gelic udbg driver") from the
> powerpc tree and commit dcd83aaff1c8 ("tty/powerpc: introduce the ePAPR
> embedded hypervisor byte channel driver") from the tty tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Thanks, that looks fine to me.

greg k-h

Re: linux-next: manual merge of the tty tree with the powerpc tree

[Greg KH]

On Wed, Sep 21, 2011 at 02:50:23PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/8250.c between commit 7df5659eefad ("serial/8250: Move
> UPIO_TSI to powerpc") from the powerpc tree and commit 4834d0289785
> ("tty: serial8250: remove UPIO_DWAPB{,32}") from the tty tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Looks great, thanks.

greg k-h

linux-next: manual merge of the tty tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2108 bytes --]

Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  arch/powerpc/include/asm/fs_pd.h

between commits:

  e6e077cb2aa4 ("powerpc/include: Declare mpc8xx_immr in 8xx_immap.h")
  fecc436a97af ("powerpc/include: Remove mpc8260.h and m82xx_pci.h")
  fbbf4280dae4 ("powerpc/8xx: Remove immr_map() and immr_unmap()")
  7768716d2f19 ("powerpc/cpm2: Remove cpm2_map() and cpm2_unmap()")

from the powerpc tree and commit:

  c2d6c1b4f034 ("serial: cpm_uart: Use get_baudrate() instead of uart_baudrate()")

from the tty tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Note that after all the above are applied, it looks like this file can
be removed completely as nothing in the tree includes it any more.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/powerpc/include/asm/fs_pd.h
index d530f68b4eef,7b61b80f212d..000000000000
--- a/arch/powerpc/include/asm/fs_pd.h
+++ b/arch/powerpc/include/asm/fs_pd.h
@@@ -14,14 -14,26 +14,4 @@@
  #include <sysdev/fsl_soc.h>
  #include <asm/time.h>
  
- static inline int uart_baudrate(void)
- {
-         return get_baudrate();
- }
 -#ifdef CONFIG_CPM2
 -#include <asm/cpm2.h>
--
- static inline int uart_clock(void)
- {
-         return ppc_proc_freq;
- }
 -#if defined(CONFIG_8260)
 -#include <asm/mpc8260.h>
 -#endif
 -
 -#define cpm2_map(member) (&cpm2_immr->member)
 -#define cpm2_map_size(member, size) (&cpm2_immr->member)
 -#define cpm2_unmap(addr) do {} while(0)
 -#endif
 -
 -#ifdef CONFIG_PPC_8xx
 -#include <asm/8xx_immap.h>
 -
 -extern immap_t __iomem *mpc8xx_immr;
 -
 -#define immr_map(member) (&mpc8xx_immr->member)
 -#define immr_map_size(member, size) (&mpc8xx_immr->member)
 -#define immr_unmap(addr) do {} while (0)
 -#endif
--
  #endif

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the tty tree with the powerpc tree

[Greg KH]

On Fri, Aug 18, 2023 at 02:58:26PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tty tree got a conflict in:
> 
>   arch/powerpc/include/asm/fs_pd.h
> 
> between commits:
> 
>   e6e077cb2aa4 ("powerpc/include: Declare mpc8xx_immr in 8xx_immap.h")
>   fecc436a97af ("powerpc/include: Remove mpc8260.h and m82xx_pci.h")
>   fbbf4280dae4 ("powerpc/8xx: Remove immr_map() and immr_unmap()")
>   7768716d2f19 ("powerpc/cpm2: Remove cpm2_map() and cpm2_unmap()")
> 
> from the powerpc tree and commit:
> 
>   c2d6c1b4f034 ("serial: cpm_uart: Use get_baudrate() instead of uart_baudrate()")
> 
> from the tty tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> Note that after all the above are applied, it looks like this file can
> be removed completely as nothing in the tree includes it any more.

Thanks for the notice, I'll let the ppc developers remove it as it's in
their tree.

thanks,

greg k-h

Re: linux-next: manual merge of the tty tree with the powerpc tree

[Michael Ellerman]

Greg KH <greg@kroah.com> writes:
> On Fri, Aug 18, 2023 at 02:58:26PM +1000, Stephen Rothwell wrote:
>> Hi all,
>> 
>> Today's linux-next merge of the tty tree got a conflict in:
>> 
>>   arch/powerpc/include/asm/fs_pd.h
>> 
>> between commits:
>> 
>>   e6e077cb2aa4 ("powerpc/include: Declare mpc8xx_immr in 8xx_immap.h")
>>   fecc436a97af ("powerpc/include: Remove mpc8260.h and m82xx_pci.h")
>>   fbbf4280dae4 ("powerpc/8xx: Remove immr_map() and immr_unmap()")
>>   7768716d2f19 ("powerpc/cpm2: Remove cpm2_map() and cpm2_unmap()")
>> 
>> from the powerpc tree and commit:
>> 
>>   c2d6c1b4f034 ("serial: cpm_uart: Use get_baudrate() instead of uart_baudrate()")
>> 
>> from the tty tree.
>> 
>> I fixed it up (see below) and can carry the fix as necessary. This
>> is now fixed as far as linux-next is concerned, but any non trivial
>> conflicts should be mentioned to your upstream maintainer when your tree
>> is submitted for merging.  You may also want to consider cooperating
>> with the maintainer of the conflicting tree to minimise any particularly
>> complex conflicts.
>> 
>> Note that after all the above are applied, it looks like this file can
>> be removed completely as nothing in the tree includes it any more.
>
> Thanks for the notice, I'll let the ppc developers remove it as it's in
> their tree.

Ack.

cheers

linux-next: manual merge of the tty tree with the powerpc tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 851 bytes --]

Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  drivers/tty/hvc/hvc_console.h

between commit:

  c9e38dc90e1c ("tty: hvc: Make hvc_remove() return no value")

from the powerpc tree and commit:

  7f30c19caf94 ("tty: hvc: Make hvc_remove() return no value")

from the tty tree.

These are slightly different versions of the same patch.

I fixed it up (I used the former version (removed "extern" from a function
declaration)) and can carry the fix as necessary. This is now fixed as
far as linux-next is concerned, but any non trivial conflicts should be
mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the tty tree with the powerpc tree

[Michael Ellerman]

Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the tty tree got a conflict in:
>
>   drivers/tty/hvc/hvc_console.h
>
> between commit:
>
>   c9e38dc90e1c ("tty: hvc: Make hvc_remove() return no value")
>
> from the powerpc tree and commit:
>
>   7f30c19caf94 ("tty: hvc: Make hvc_remove() return no value")
>
> from the tty tree.
>
> These are slightly different versions of the same patch.

I'll drop it from my tree.

cheers

Re: linux-next: manual merge of the tty tree with the powerpc tree

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 904 bytes --]

Hello,

On Mon, Nov 27, 2023 at 10:00:58PM +1100, Michael Ellerman wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> > Hi all,
> >
> > Today's linux-next merge of the tty tree got a conflict in:
> >
> >   drivers/tty/hvc/hvc_console.h
> >
> > between commit:
> >
> >   c9e38dc90e1c ("tty: hvc: Make hvc_remove() return no value")
> >
> > from the powerpc tree and commit:
> >
> >   7f30c19caf94 ("tty: hvc: Make hvc_remove() return no value")
> >
> > from the tty tree.
> >
> > These are slightly different versions of the same patch.
> 
> I'll drop it from my tree.

FTR: Regarding the slightly difference: The variant in the tty tree is
the better one. So nothing to do for Greg (or me) here.

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]