| Message ID | 1467250062-61583-3-git-send-email-wangkefeng.wang@huawei.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Thu, 2016-06-30 at 09:27 +0800, Kefeng Wang wrote: > Add ACPI identifier for UART on Hisilicon Hip05 soc, be careful > that it is not 16550 compatibal. > > Meanwhile, set dw8250_serial_out32 to keep consistent between > serial_out > and serial_in in ACPI. > > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > --- > drivers/tty/serial/8250/8250_dw.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/tty/serial/8250/8250_dw.c > b/drivers/tty/serial/8250/8250_dw.c > index 65f3da7..096431b 100644 > --- a/drivers/tty/serial/8250/8250_dw.c > +++ b/drivers/tty/serial/8250/8250_dw.c > @@ -272,6 +272,12 @@ static bool dw8250_idma_filter(struct dma_chan > *chan, void *param) > return param == chan->device->dev->parent; > } > > +/* non 16550 compatible id list*/ > +static const struct acpi_device_id non_16550_id_list[] = { > + { "HISI0031", 0 }, > + { }, > +}; > + On first glance it looks redundant, see below. > static void dw8250_quirks(struct uart_port *p, struct dw8250_data > *data) > { > if (p->dev->of_node) { > @@ -301,8 +307,10 @@ static void dw8250_quirks(struct uart_port *p, > struct dw8250_data *data) > p->iotype = UPIO_MEM32; > p->regshift = 2; > p->serial_in = dw8250_serial_in32; > - /* So far none of there implement the Busy > Functionality */ > - data->uart_16550_compatible = true; > + p->serial_out = dw8250_serial_out32; > + > + if (!acpi_match_device(non_16550_id_list, p->dev)) > + data->uart_16550_compatible = true; > } > > /* Platforms with iDMA */ > @@ -618,6 +626,7 @@ static const struct acpi_device_id > dw8250_acpi_match[] = { > { "APMC0D08", 0}, > { "AMD0020", 0 }, > { "AMDI0020", 0 }, > + { "HISI0031", 0 }, So, we may put something instead of 0 here and consider it as a set of special quirks / setup instructions / etc. struct dw8250_dev_info { unsigned int uart_16550_compatible:1; }; static const struct dw8250_dev_info hisi_dev_info = { .uart_16550_compatible = 1, } ... { "HISI0031", (kernel_ulong_t)&hisi_dev_info }, ... And so on. > { }, > }; > MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match);
On Thu, 2016-06-30 at 12:38 +0300, Andy Shevchenko wrote: > On Thu, 2016-06-30 at 09:27 +0800, Kefeng Wang wrote: > > Add ACPI identifier for UART on Hisilicon Hip05 soc, be careful > > that it is not 16550 compatibal. > > > > Meanwhile, set dw8250_serial_out32 to keep consistent between > > serial_out > > and serial_in in ACPI. > > > > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > > --- > > drivers/tty/serial/8250/8250_dw.c | 13 +++++++++++-- > > 1 file changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/tty/serial/8250/8250_dw.c > > b/drivers/tty/serial/8250/8250_dw.c > > index 65f3da7..096431b 100644 > > --- a/drivers/tty/serial/8250/8250_dw.c > > +++ b/drivers/tty/serial/8250/8250_dw.c > > @@ -272,6 +272,12 @@ static bool dw8250_idma_filter(struct dma_chan > > *chan, void *param) > > return param == chan->device->dev->parent; > > } > > > > +/* non 16550 compatible id list*/ > > +static const struct acpi_device_id non_16550_id_list[] = { > > + { "HISI0031", 0 }, > > + { }, > > +}; > > + > > On first glance it looks redundant, see below. Oh, wait, this is still valid, but the better solution is to use device properties for the rest except yours! I will prepare patch later this week or at the beginning of next week if you are in hurry, otherwise I would postpone this a bit (anyway it will not make v4.8 cycle).
On 2016/6/30 17:54, Andy Shevchenko wrote: > On Thu, 2016-06-30 at 12:38 +0300, Andy Shevchenko wrote: >> On Thu, 2016-06-30 at 09:27 +0800, Kefeng Wang wrote: >>> Add ACPI identifier for UART on Hisilicon Hip05 soc, be careful >>> that it is not 16550 compatibal. >>> >>> Meanwhile, set dw8250_serial_out32 to keep consistent between >>> serial_out >>> and serial_in in ACPI. >>> >>> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> >>> --- >>> drivers/tty/serial/8250/8250_dw.c | 13 +++++++++++-- >>> 1 file changed, 11 insertions(+), 2 deletions(-) >>> >>> diff --git a/drivers/tty/serial/8250/8250_dw.c >>> b/drivers/tty/serial/8250/8250_dw.c >>> index 65f3da7..096431b 100644 >>> --- a/drivers/tty/serial/8250/8250_dw.c >>> +++ b/drivers/tty/serial/8250/8250_dw.c >>> @@ -272,6 +272,12 @@ static bool dw8250_idma_filter(struct dma_chan >>> *chan, void *param) >>> return param == chan->device->dev->parent; >>> } >>> >>> +/* non 16550 compatible id list*/ >>> +static const struct acpi_device_id non_16550_id_list[] = { >>> + { "HISI0031", 0 }, >>> + { }, >>> +}; >>> + >> >> On first glance it looks redundant, see below. > > Oh, wait, this is still valid, but the better solution is to use device > properties for the rest except yours! Do you mean using something like static struct property_entry dw8250_properties[] = { PROPERTY_ENTRY_U32("reg-io-width", 4), PROPERTY_ENTRY_U32("reg-shift", 2), PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible"), { }, }; then use platform_device_add_properties to add it to the device(16500 compatible), but for hisi, use another property_entry without PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible")? Not clear about using device properties. > > I will prepare patch later this week or at the beginning of next week if > you are in hurry, otherwise I would postpone this a bit (anyway it will > not make v4.8 cycle). > Thanks, hope that it will come out soon. BRs, Kefeng -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 2016-06-30 at 22:26 +0800, Kefeng Wang wrote: > > On 2016/6/30 17:54, Andy Shevchenko wrote: > > On Thu, 2016-06-30 at 12:38 +0300, Andy Shevchenko wrote: > > > On Thu, 2016-06-30 at 09:27 +0800, Kefeng Wang wrote: > > > > Add ACPI identifier for UART on Hisilicon Hip05 soc, be careful > > > > that it is not 16550 compatibal. > > > > > > > > Meanwhile, set dw8250_serial_out32 to keep consistent between > > > > serial_out > > > > and serial_in in ACPI. > > > > > > > > Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> > > > > --- > > > > drivers/tty/serial/8250/8250_dw.c | 13 +++++++++++-- > > > > 1 file changed, 11 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/drivers/tty/serial/8250/8250_dw.c > > > > b/drivers/tty/serial/8250/8250_dw.c > > > > index 65f3da7..096431b 100644 > > > > --- a/drivers/tty/serial/8250/8250_dw.c > > > > +++ b/drivers/tty/serial/8250/8250_dw.c > > > > @@ -272,6 +272,12 @@ static bool dw8250_idma_filter(struct > > > > dma_chan > > > > *chan, void *param) > > > > return param == chan->device->dev->parent; > > > > } > > > > > > > > +/* non 16550 compatible id list*/ > > > > +static const struct acpi_device_id non_16550_id_list[] = { > > > > + { "HISI0031", 0 }, > > > > + { }, > > > > +}; > > > > + > > > > > > On first glance it looks redundant, see below. > > > > Oh, wait, this is still valid, but the better solution is to use > > device > > properties for the rest except yours! > > Do you mean using something like > > static struct property_entry dw8250_properties[] = { > PROPERTY_ENTRY_U32("reg-io-width", 4), > PROPERTY_ENTRY_U32("reg-shift", 2), > PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible"), > { }, > }; > > then use platform_device_add_properties to add it to the device(16500 > compatible), Correct for the existing devices. > > but for hisi, use another property_entry without > PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible")? For HISI in case of alternate configuration you have to tweak _DSD in ACPI. > > Not clear about using device properties. Built-in device properties only for non-DT, non-ACPI devices. You may consider it as a successor of platform data. > > > > > I will prepare patch later this week or at the beginning of next > > week if > > you are in hurry, otherwise I would postpone this a bit (anyway it > > will > > not make v4.8 cycle). > > > > Thanks, hope that it will come out soon. >
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 65f3da7..096431b 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -272,6 +272,12 @@ static bool dw8250_idma_filter(struct dma_chan *chan, void *param) return param == chan->device->dev->parent; } +/* non 16550 compatible id list*/ +static const struct acpi_device_id non_16550_id_list[] = { + { "HISI0031", 0 }, + { }, +}; + static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) { if (p->dev->of_node) { @@ -301,8 +307,10 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) p->iotype = UPIO_MEM32; p->regshift = 2; p->serial_in = dw8250_serial_in32; - /* So far none of there implement the Busy Functionality */ - data->uart_16550_compatible = true; + p->serial_out = dw8250_serial_out32; + + if (!acpi_match_device(non_16550_id_list, p->dev)) + data->uart_16550_compatible = true; } /* Platforms with iDMA */ @@ -618,6 +626,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = { { "APMC0D08", 0}, { "AMD0020", 0 }, { "AMDI0020", 0 }, + { "HISI0031", 0 }, { }, }; MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match);
Add ACPI identifier for UART on Hisilicon Hip05 soc, be careful that it is not 16550 compatibal. Meanwhile, set dw8250_serial_out32 to keep consistent between serial_out and serial_in in ACPI. Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- drivers/tty/serial/8250/8250_dw.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)