2022-06-29 00:25:48

by Jeremy Linton

Subject: [PATCH 1/2] Revert "serial: 8250: dw: Move the USR register to pdata"

pdata is only setup by DT machines, leaving ACPI machines
with null pdata. Since I don't know the exact mapping of
ACPI ID's to dw 8250 variations I can't add pdata to them
without possibly breaking something. As such the simplest
fix here is probably just to revert this commit.

This reverts commit ffd381445eac2aa624e49bab5a811451e8351008.
Signed-off-by: Jeremy Linton <[email protected]>
---
drivers/tty/serial/8250/8250_dw.c | 9 +++------
drivers/tty/serial/8250/8250_dwlib.h | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c
index f57bbd32ef11..53e488beb8c2 100644
--- a/drivers/tty/serial/8250/8250_dw.c
+++ b/drivers/tty/serial/8250/8250_dw.c
@@ -275,7 +275,7 @@ static int dw8250_handle_irq(struct uart_port *p)

if ((iir & UART_IIR_BUSY) == UART_IIR_BUSY) {
/* Clear the USR */
- (void)p->serial_in(p, d->pdata->usr_reg);
+ (void)p->serial_in(p, d->usr_reg);

return 1;
}
@@ -447,6 +447,7 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data)
p->serial_out = dw8250_serial_outq;
p->flags = UPF_SKIP_TEST | UPF_SHARE_IRQ | UPF_FIXED_TYPE;
p->type = PORT_OCTEON;
+ data->usr_reg = OCTEON_UART_USR;
data->skip_autocfg = true;
}
#endif
@@ -536,6 +537,7 @@ static int dw8250_probe(struct platform_device *pdev)
return -ENOMEM;

data->data.dma.fn = dw8250_fallback_dma_filter;
+ data->usr_reg = DW_UART_USR;
data->pdata = device_get_match_data(p->dev);
p->private_data = &data->data;

@@ -738,27 +740,22 @@ static const struct dev_pm_ops dw8250_pm_ops = {
};

static const struct dw8250_platform_data dw8250_dw_apb = {
- .usr_reg = DW_UART_USR,
};

static const struct dw8250_platform_data dw8250_octeon_3860_data = {
- .usr_reg = OCTEON_UART_USR,
.quirks = DW_UART_QUIRK_OCTEON,
};

static const struct dw8250_platform_data dw8250_armada_38x_data = {
- .usr_reg = DW_UART_USR,
.quirks = DW_UART_QUIRK_ARMADA_38X,
};

static const struct dw8250_platform_data dw8250_renesas_rzn1_data = {
- .usr_reg = DW_UART_USR,
.cpr_val = 0x00012f32,
.quirks = DW_UART_QUIRK_IS_DMA_FC,
};

static const struct dw8250_platform_data dw8250_starfive_jh7100_data = {
- .usr_reg = DW_UART_USR,
.quirks = DW_UART_QUIRK_SKIP_SET_RATE,
};

diff --git a/drivers/tty/serial/8250/8250_dwlib.h b/drivers/tty/serial/8250/8250_dwlib.h
index 055bfdc87985..9870ad0d54e4 100644
--- a/drivers/tty/serial/8250/8250_dwlib.h
+++ b/drivers/tty/serial/8250/8250_dwlib.h
@@ -26,7 +26,6 @@ struct dw8250_port_data {
};

struct dw8250_platform_data {
- u8 usr_reg;
u32 cpr_val;
unsigned int quirks;
};
@@ -35,6 +34,7 @@ struct dw8250_data {
struct dw8250_port_data data;
const struct dw8250_platform_data *pdata;

+ u8 usr_reg;
int msr_mask_on;
int msr_mask_off;
struct clk *clk;
--
2.35.1

2022-06-29 06:57:47

by Greg Kroah-Hartman

Subject: Re: [PATCH 1/2] Revert "serial: 8250: dw: Move the USR register to pdata"

On Tue, Jun 28, 2022 at 07:02:31PM -0500, Jeremy Linton wrote:
> pdata is only setup by DT machines, leaving ACPI machines
> with null pdata. Since I don't know the exact mapping of
> ACPI ID's to dw 8250 variations I can't add pdata to them
> without possibly breaking something. As such the simplest
> fix here is probably just to revert this commit.
>
> This reverts commit ffd381445eac2aa624e49bab5a811451e8351008.
> Signed-off-by: Jeremy Linton <[email protected]>

Didn't checkpatch complain that you need a blank line before your
signed-off-by line?

thanks,

greg k-h

2022-06-29 14:57:39

by Jeremy Linton

Subject: Re: [PATCH 1/2] Revert "serial: 8250: dw: Move the USR register to pdata"

Hi,

On 6/29/22 01:08, Greg KH wrote:
> On Tue, Jun 28, 2022 at 07:02:31PM -0500, Jeremy Linton wrote:
>> pdata is only setup by DT machines, leaving ACPI machines
>> with null pdata. Since I don't know the exact mapping of
>> ACPI ID's to dw 8250 variations I can't add pdata to them
>> without possibly breaking something. As such the simplest
>> fix here is probably just to revert this commit.
>>
>> This reverts commit ffd381445eac2aa624e49bab5a811451e8351008.
>> Signed-off-by: Jeremy Linton <[email protected]>
>
> Didn't checkpatch complain that you need a blank line before your
> signed-off-by line?

No, it, and I apparently thought that the revert was part of the tagging.

Lets kill this set anyway, as the patch you already have to add pdata to
ACPI in tty-linus solves all these problems. I guess I missed that
posting, so sorry about the noise.

Thanks,