* [PATCH] ata: pata_buddha: pata_gayle: consolidate .sff_data_xfer around libata::ata_sff_data_xfer()
@ 2024-06-04 16:22 Paolo Pisati
2024-06-04 20:17 ` Sergey Shtylyov
2024-06-04 20:29 ` Niklas Cassel
0 siblings, 2 replies; 3+ messages in thread
From: Paolo Pisati @ 2024-06-04 16:22 UTC (permalink / raw)
To: Sergey Shtylyov, Damien Le Moal; +Cc: linux-m68k, linux-ide, linux-kernel
pata_buddha_data_xfer(), pata_gayle_data_xfer() and ata_sff_data_xfer() are the
same function, consolidate around libata::ata_sff_data_xfer().
Signed-off-by: Paolo Pisati <p.pisati@gmail.com>
---
drivers/ata/pata_buddha.c | 40 ++-------------------------------------
drivers/ata/pata_gayle.c | 40 ++-------------------------------------
2 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/drivers/ata/pata_buddha.c b/drivers/ata/pata_buddha.c
index c36ee991d5e5..234278eb26e1 100644
--- a/drivers/ata/pata_buddha.c
+++ b/drivers/ata/pata_buddha.c
@@ -60,42 +60,6 @@ static const struct scsi_host_template pata_buddha_sht = {
ATA_PIO_SHT(DRV_NAME),
};
-/* FIXME: is this needed? */
-static unsigned int pata_buddha_data_xfer(struct ata_queued_cmd *qc,
- unsigned char *buf,
- unsigned int buflen, int rw)
-{
- struct ata_device *dev = qc->dev;
- struct ata_port *ap = dev->link->ap;
- void __iomem *data_addr = ap->ioaddr.data_addr;
- unsigned int words = buflen >> 1;
-
- /* Transfer multiple of 2 bytes */
- if (rw == READ)
- raw_insw((u16 *)data_addr, (u16 *)buf, words);
- else
- raw_outsw((u16 *)data_addr, (u16 *)buf, words);
-
- /* Transfer trailing byte, if any. */
- if (unlikely(buflen & 0x01)) {
- unsigned char pad[2] = { };
-
- /* Point buf to the tail of buffer */
- buf += buflen - 1;
-
- if (rw == READ) {
- raw_insw((u16 *)data_addr, (u16 *)pad, 1);
- *buf = pad[0];
- } else {
- pad[0] = *buf;
- raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
- }
- words++;
- }
-
- return words << 1;
-}
-
/*
* Provide our own set_mode() as we don't want to change anything that has
* already been configured..
@@ -131,7 +95,7 @@ static void pata_xsurf_irq_clear(struct ata_port *ap)
static struct ata_port_operations pata_buddha_ops = {
.inherits = &ata_sff_port_ops,
- .sff_data_xfer = pata_buddha_data_xfer,
+ .sff_data_xfer = ata_sff_data_xfer,
.sff_irq_check = pata_buddha_irq_check,
.cable_detect = ata_cable_unknown,
.set_mode = pata_buddha_set_mode,
@@ -139,7 +103,7 @@ static struct ata_port_operations pata_buddha_ops = {
static struct ata_port_operations pata_xsurf_ops = {
.inherits = &ata_sff_port_ops,
- .sff_data_xfer = pata_buddha_data_xfer,
+ .sff_data_xfer = ata_sff_data_xfer,
.sff_irq_check = pata_buddha_irq_check,
.sff_irq_clear = pata_xsurf_irq_clear,
.cable_detect = ata_cable_unknown,
diff --git a/drivers/ata/pata_gayle.c b/drivers/ata/pata_gayle.c
index 3bdbe2b65a2b..febffc36a18f 100644
--- a/drivers/ata/pata_gayle.c
+++ b/drivers/ata/pata_gayle.c
@@ -38,42 +38,6 @@ static const struct scsi_host_template pata_gayle_sht = {
ATA_PIO_SHT(DRV_NAME),
};
-/* FIXME: is this needed? */
-static unsigned int pata_gayle_data_xfer(struct ata_queued_cmd *qc,
- unsigned char *buf,
- unsigned int buflen, int rw)
-{
- struct ata_device *dev = qc->dev;
- struct ata_port *ap = dev->link->ap;
- void __iomem *data_addr = ap->ioaddr.data_addr;
- unsigned int words = buflen >> 1;
-
- /* Transfer multiple of 2 bytes */
- if (rw == READ)
- raw_insw((u16 *)data_addr, (u16 *)buf, words);
- else
- raw_outsw((u16 *)data_addr, (u16 *)buf, words);
-
- /* Transfer trailing byte, if any. */
- if (unlikely(buflen & 0x01)) {
- unsigned char pad[2] = { };
-
- /* Point buf to the tail of buffer */
- buf += buflen - 1;
-
- if (rw == READ) {
- raw_insw((u16 *)data_addr, (u16 *)pad, 1);
- *buf = pad[0];
- } else {
- pad[0] = *buf;
- raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
- }
- words++;
- }
-
- return words << 1;
-}
-
/*
* Provide our own set_mode() as we don't want to change anything that has
* already been configured..
@@ -110,7 +74,7 @@ static void pata_gayle_irq_clear(struct ata_port *ap)
static struct ata_port_operations pata_gayle_a1200_ops = {
.inherits = &ata_sff_port_ops,
- .sff_data_xfer = pata_gayle_data_xfer,
+ .sff_data_xfer = ata_sff_data_xfer,
.sff_irq_check = pata_gayle_irq_check,
.sff_irq_clear = pata_gayle_irq_clear,
.cable_detect = ata_cable_unknown,
@@ -119,7 +83,7 @@ static struct ata_port_operations pata_gayle_a1200_ops = {
static struct ata_port_operations pata_gayle_a4000_ops = {
.inherits = &ata_sff_port_ops,
- .sff_data_xfer = pata_gayle_data_xfer,
+ .sff_data_xfer = ata_sff_data_xfer,
.cable_detect = ata_cable_unknown,
.set_mode = pata_gayle_set_mode,
};
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ata: pata_buddha: pata_gayle: consolidate .sff_data_xfer around libata::ata_sff_data_xfer()
2024-06-04 16:22 [PATCH] ata: pata_buddha: pata_gayle: consolidate .sff_data_xfer around libata::ata_sff_data_xfer() Paolo Pisati
@ 2024-06-04 20:17 ` Sergey Shtylyov
2024-06-04 20:29 ` Niklas Cassel
1 sibling, 0 replies; 3+ messages in thread
From: Sergey Shtylyov @ 2024-06-04 20:17 UTC (permalink / raw)
To: Paolo Pisati, Damien Le Moal; +Cc: linux-m68k, linux-ide, linux-kernel
Hello!
Please do 2 separate patches (for each driver), or at last name the
patch s/th like "ata: pata_{buddha,gayle}: consolidate .sff_data_xfer around libata-sff.c::ata_sff_data_xfer()"...
On 6/4/24 7:22 PM, Paolo Pisati wrote:
> pata_buddha_data_xfer(), pata_gayle_data_xfer() and ata_sff_data_xfer() are the
> same function, consolidate around libata::ata_sff_data_xfer().
>
> Signed-off-by: Paolo Pisati <p.pisati@gmail.com>
> ---
> drivers/ata/pata_buddha.c | 40 ++-------------------------------------
> drivers/ata/pata_gayle.c | 40 ++-------------------------------------
> 2 files changed, 4 insertions(+), 76 deletions(-)
>
> diff --git a/drivers/ata/pata_buddha.c b/drivers/ata/pata_buddha.c
> index c36ee991d5e5..234278eb26e1 100644
> --- a/drivers/ata/pata_buddha.c
> +++ b/drivers/ata/pata_buddha.c
> @@ -60,42 +60,6 @@ static const struct scsi_host_template pata_buddha_sht = {
> ATA_PIO_SHT(DRV_NAME),
> };
>
> -/* FIXME: is this needed? */
> -static unsigned int pata_buddha_data_xfer(struct ata_queued_cmd *qc,
> - unsigned char *buf,
> - unsigned int buflen, int rw)
> -{
> - struct ata_device *dev = qc->dev;
> - struct ata_port *ap = dev->link->ap;
> - void __iomem *data_addr = ap->ioaddr.data_addr;
> - unsigned int words = buflen >> 1;
> -
> - /* Transfer multiple of 2 bytes */
> - if (rw == READ)
> - raw_insw((u16 *)data_addr, (u16 *)buf, words);
> - else
> - raw_outsw((u16 *)data_addr, (u16 *)buf, words);
Hm, are you sure these calls are equivalent to io{read,write}16_rep()?
> -
> - /* Transfer trailing byte, if any. */
> - if (unlikely(buflen & 0x01)) {
> - unsigned char pad[2] = { };
> -
> - /* Point buf to the tail of buffer */
> - buf += buflen - 1;
> -
> - if (rw == READ) {
> - raw_insw((u16 *)data_addr, (u16 *)pad, 1);
> - *buf = pad[0];
> - } else {
> - pad[0] = *buf;
> - raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
> - }
> - words++;
> - }
> -
> - return words << 1;
> -}
> -
> /*
> * Provide our own set_mode() as we don't want to change anything that has
> * already been configured..
> @@ -131,7 +95,7 @@ static void pata_xsurf_irq_clear(struct ata_port *ap)
>
> static struct ata_port_operations pata_buddha_ops = {
> .inherits = &ata_sff_port_ops,
> - .sff_data_xfer = pata_buddha_data_xfer,
> + .sff_data_xfer = ata_sff_data_xfer,
There should be no need -- this method is preperly init'ed in ata_sff_port_ops...
> .sff_irq_check = pata_buddha_irq_check,
> .cable_detect = ata_cable_unknown,
> .set_mode = pata_buddha_set_mode,
> @@ -139,7 +103,7 @@ static struct ata_port_operations pata_buddha_ops = {
>
> static struct ata_port_operations pata_xsurf_ops = {
> .inherits = &ata_sff_port_ops,
> - .sff_data_xfer = pata_buddha_data_xfer,
> + .sff_data_xfer = ata_sff_data_xfer,
Here as well...
> .sff_irq_check = pata_buddha_irq_check,
> .sff_irq_clear = pata_xsurf_irq_clear,
> .cable_detect = ata_cable_unknown,
> diff --git a/drivers/ata/pata_gayle.c b/drivers/ata/pata_gayle.c
> index 3bdbe2b65a2b..febffc36a18f 100644
> --- a/drivers/ata/pata_gayle.c
> +++ b/drivers/ata/pata_gayle.c
> @@ -38,42 +38,6 @@ static const struct scsi_host_template pata_gayle_sht = {
> ATA_PIO_SHT(DRV_NAME),
> };
>
> -/* FIXME: is this needed? */
> -static unsigned int pata_gayle_data_xfer(struct ata_queued_cmd *qc,
> - unsigned char *buf,
> - unsigned int buflen, int rw)
> -{
> - struct ata_device *dev = qc->dev;
> - struct ata_port *ap = dev->link->ap;
> - void __iomem *data_addr = ap->ioaddr.data_addr;
> - unsigned int words = buflen >> 1;
> -
> - /* Transfer multiple of 2 bytes */
> - if (rw == READ)
> - raw_insw((u16 *)data_addr, (u16 *)buf, words);
> - else
> - raw_outsw((u16 *)data_addr, (u16 *)buf, words);
> -
> - /* Transfer trailing byte, if any. */
> - if (unlikely(buflen & 0x01)) {
> - unsigned char pad[2] = { };
> -
> - /* Point buf to the tail of buffer */
> - buf += buflen - 1;
> -
> - if (rw == READ) {
> - raw_insw((u16 *)data_addr, (u16 *)pad, 1);
> - *buf = pad[0];
> - } else {
> - pad[0] = *buf;
> - raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
> - }
> - words++;
> - }
> -
> - return words << 1;
> -}
> -
Same question as above here...
> /*
> * Provide our own set_mode() as we don't want to change anything that has
> * already been configured..
> @@ -110,7 +74,7 @@ static void pata_gayle_irq_clear(struct ata_port *ap)
>
> static struct ata_port_operations pata_gayle_a1200_ops = {
> .inherits = &ata_sff_port_ops,
> - .sff_data_xfer = pata_gayle_data_xfer,
> + .sff_data_xfer = ata_sff_data_xfer,
> .sff_irq_check = pata_gayle_irq_check,
> .sff_irq_clear = pata_gayle_irq_clear,
> .cable_detect = ata_cable_unknown,
> @@ -119,7 +83,7 @@ static struct ata_port_operations pata_gayle_a1200_ops = {
>
> static struct ata_port_operations pata_gayle_a4000_ops = {
> .inherits = &ata_sff_port_ops,
> - .sff_data_xfer = pata_gayle_data_xfer,
> + .sff_data_xfer = ata_sff_data_xfer,
> .cable_detect = ata_cable_unknown,
> .set_mode = pata_gayle_set_mode,
> };
>
Same comments as to pata_buddha.c here...
MBR, Sergey
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ata: pata_buddha: pata_gayle: consolidate .sff_data_xfer around libata::ata_sff_data_xfer()
2024-06-04 16:22 [PATCH] ata: pata_buddha: pata_gayle: consolidate .sff_data_xfer around libata::ata_sff_data_xfer() Paolo Pisati
2024-06-04 20:17 ` Sergey Shtylyov
@ 2024-06-04 20:29 ` Niklas Cassel
1 sibling, 0 replies; 3+ messages in thread
From: Niklas Cassel @ 2024-06-04 20:29 UTC (permalink / raw)
To: Paolo Pisati
Cc: Sergey Shtylyov, Damien Le Moal, linux-m68k, linux-ide,
linux-kernel
Hello Paolo,
On Tue, Jun 04, 2024 at 06:22:17PM +0200, Paolo Pisati wrote:
> pata_buddha_data_xfer(), pata_gayle_data_xfer() and ata_sff_data_xfer() are the
> same function, consolidate around libata::ata_sff_data_xfer().
Please avoid the C++ namespace operator,
just drop "libata::" here and in the subject.
Also please just split this into two patches, one per driver.
>
> Signed-off-by: Paolo Pisati <p.pisati@gmail.com>
> ---
> drivers/ata/pata_buddha.c | 40 ++-------------------------------------
> drivers/ata/pata_gayle.c | 40 ++-------------------------------------
> 2 files changed, 4 insertions(+), 76 deletions(-)
>
> diff --git a/drivers/ata/pata_buddha.c b/drivers/ata/pata_buddha.c
> index c36ee991d5e5..234278eb26e1 100644
> --- a/drivers/ata/pata_buddha.c
> +++ b/drivers/ata/pata_buddha.c
> @@ -60,42 +60,6 @@ static const struct scsi_host_template pata_buddha_sht = {
> ATA_PIO_SHT(DRV_NAME),
> };
>
> -/* FIXME: is this needed? */
> -static unsigned int pata_buddha_data_xfer(struct ata_queued_cmd *qc,
> - unsigned char *buf,
> - unsigned int buflen, int rw)
> -{
> - struct ata_device *dev = qc->dev;
> - struct ata_port *ap = dev->link->ap;
> - void __iomem *data_addr = ap->ioaddr.data_addr;
> - unsigned int words = buflen >> 1;
> -
> - /* Transfer multiple of 2 bytes */
> - if (rw == READ)
> - raw_insw((u16 *)data_addr, (u16 *)buf, words);
> - else
> - raw_outsw((u16 *)data_addr, (u16 *)buf, words);
> -
> - /* Transfer trailing byte, if any. */
> - if (unlikely(buflen & 0x01)) {
> - unsigned char pad[2] = { };
> -
> - /* Point buf to the tail of buffer */
> - buf += buflen - 1;
> -
> - if (rw == READ) {
> - raw_insw((u16 *)data_addr, (u16 *)pad, 1);
> - *buf = pad[0];
> - } else {
> - pad[0] = *buf;
> - raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
> - }
> - words++;
> - }
> -
> - return words << 1;
> -}
> -
> /*
> * Provide our own set_mode() as we don't want to change anything that has
> * already been configured..
> @@ -131,7 +95,7 @@ static void pata_xsurf_irq_clear(struct ata_port *ap)
>
> static struct ata_port_operations pata_buddha_ops = {
> .inherits = &ata_sff_port_ops,
> - .sff_data_xfer = pata_buddha_data_xfer,
> + .sff_data_xfer = ata_sff_data_xfer,
Since this driver inherits ata_sff_port_ops,
which sets .sff_data_xfer to ata_sff_data_xfer:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/ata/libata-sff.c?h=v6.10-rc2#n46
this line should not be needed.
> .sff_irq_check = pata_buddha_irq_check,
> .cable_detect = ata_cable_unknown,
> .set_mode = pata_buddha_set_mode,
> @@ -139,7 +103,7 @@ static struct ata_port_operations pata_buddha_ops = {
>
> static struct ata_port_operations pata_xsurf_ops = {
> .inherits = &ata_sff_port_ops,
> - .sff_data_xfer = pata_buddha_data_xfer,
> + .sff_data_xfer = ata_sff_data_xfer,
> .sff_irq_check = pata_buddha_irq_check,
> .sff_irq_clear = pata_xsurf_irq_clear,
> .cable_detect = ata_cable_unknown,
> diff --git a/drivers/ata/pata_gayle.c b/drivers/ata/pata_gayle.c
> index 3bdbe2b65a2b..febffc36a18f 100644
> --- a/drivers/ata/pata_gayle.c
> +++ b/drivers/ata/pata_gayle.c
> @@ -38,42 +38,6 @@ static const struct scsi_host_template pata_gayle_sht = {
> ATA_PIO_SHT(DRV_NAME),
> };
>
> -/* FIXME: is this needed? */
> -static unsigned int pata_gayle_data_xfer(struct ata_queued_cmd *qc,
> - unsigned char *buf,
> - unsigned int buflen, int rw)
> -{
> - struct ata_device *dev = qc->dev;
> - struct ata_port *ap = dev->link->ap;
> - void __iomem *data_addr = ap->ioaddr.data_addr;
> - unsigned int words = buflen >> 1;
> -
> - /* Transfer multiple of 2 bytes */
> - if (rw == READ)
> - raw_insw((u16 *)data_addr, (u16 *)buf, words);
> - else
> - raw_outsw((u16 *)data_addr, (u16 *)buf, words);
> -
> - /* Transfer trailing byte, if any. */
> - if (unlikely(buflen & 0x01)) {
> - unsigned char pad[2] = { };
> -
> - /* Point buf to the tail of buffer */
> - buf += buflen - 1;
> -
> - if (rw == READ) {
> - raw_insw((u16 *)data_addr, (u16 *)pad, 1);
> - *buf = pad[0];
> - } else {
> - pad[0] = *buf;
> - raw_outsw((u16 *)data_addr, (u16 *)pad, 1);
> - }
> - words++;
> - }
> -
> - return words << 1;
> -}
> -
> /*
> * Provide our own set_mode() as we don't want to change anything that has
> * already been configured..
> @@ -110,7 +74,7 @@ static void pata_gayle_irq_clear(struct ata_port *ap)
>
> static struct ata_port_operations pata_gayle_a1200_ops = {
> .inherits = &ata_sff_port_ops,
> - .sff_data_xfer = pata_gayle_data_xfer,
> + .sff_data_xfer = ata_sff_data_xfer,
Same comment as for the other driver.
Kind regards,
Niklas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-04 20:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-04 16:22 [PATCH] ata: pata_buddha: pata_gayle: consolidate .sff_data_xfer around libata::ata_sff_data_xfer() Paolo Pisati
2024-06-04 20:17 ` Sergey Shtylyov
2024-06-04 20:29 ` Niklas Cassel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).