* [PATCH] ata: pata_hpt37x: merge mode setting methods
@ 2022-02-16 11:24 Sergey Shtylyov
2022-02-16 11:29 ` Damien Le Moal
0 siblings, 1 reply; 6+ messages in thread
From: Sergey Shtylyov @ 2022-02-16 11:24 UTC (permalink / raw)
To: Damien Le Moal, linux-ide
After commit e0afcf140e6e ("ata: pata_hpt37x: disable fast interrupts in
prereset() method") HPT370's and HPT372+'s PIO/DMA mode setting functions
have become identical -- merge them.
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
---
This patch is against the 'for-next' branch of Damien Le Moal's 'libata.git'
repo.
drivers/ata/pata_hpt37x.c | 71 +++++++---------------------------------------
1 file changed, 11 insertions(+), 60 deletions(-)
Index: libata/drivers/ata/pata_hpt37x.c
===================================================================
--- libata.orig/drivers/ata/pata_hpt37x.c
+++ libata/drivers/ata/pata_hpt37x.c
@@ -23,7 +23,7 @@
#include <linux/libata.h>
#define DRV_NAME "pata_hpt37x"
-#define DRV_VERSION "0.6.24"
+#define DRV_VERSION "0.6.25"
struct hpt_clock {
u8 xfer_speed;
@@ -420,7 +420,7 @@ static int hpt37x_pre_reset(struct ata_l
return ata_sff_prereset(link, deadline);
}
-static void hpt370_set_mode(struct ata_port *ap, struct ata_device *adev,
+static void hpt37x_set_mode(struct ata_port *ap, struct ata_device *adev,
u8 mode)
{
struct pci_dev *pdev = to_pci_dev(ap->host->dev);
@@ -449,9 +449,9 @@ static void hpt370_set_mode(struct ata_p
* Perform PIO mode setup.
*/
-static void hpt370_set_piomode(struct ata_port *ap, struct ata_device *adev)
+static void hpt37x_set_piomode(struct ata_port *ap, struct ata_device *adev)
{
- hpt370_set_mode(ap, adev, adev->pio_mode);
+ hpt37x_set_mode(ap, adev, adev->pio_mode);
}
/**
@@ -462,9 +462,9 @@ static void hpt370_set_piomode(struct at
* Set up the channel for MWDMA or UDMA modes.
*/
-static void hpt370_set_dmamode(struct ata_port *ap, struct ata_device *adev)
+static void hpt37x_set_dmamode(struct ata_port *ap, struct ata_device *adev)
{
- hpt370_set_mode(ap, adev, adev->dma_mode);
+ hpt37x_set_mode(ap, adev, adev->dma_mode);
}
/**
@@ -504,54 +504,6 @@ static void hpt370_bmdma_stop(struct ata
ata_bmdma_stop(qc);
}
-static void hpt372_set_mode(struct ata_port *ap, struct ata_device *adev,
- u8 mode)
-{
- struct pci_dev *pdev = to_pci_dev(ap->host->dev);
- int addr = 0x40 + 4 * (adev->devno + 2 * ap->port_no);
- u32 reg, timing, mask;
-
- /* Determine timing mask and find matching mode entry */
- if (mode < XFER_MW_DMA_0)
- mask = 0xcfc3ffff;
- else if (mode < XFER_UDMA_0)
- mask = 0x31c001ff;
- else
- mask = 0x303c0000;
-
- timing = hpt37x_find_mode(ap, mode);
-
- pci_read_config_dword(pdev, addr, ®);
- reg = (reg & ~mask) | (timing & mask);
- pci_write_config_dword(pdev, addr, reg);
-}
-
-/**
- * hpt372_set_piomode - PIO setup
- * @ap: ATA interface
- * @adev: device on the interface
- *
- * Perform PIO mode setup.
- */
-
-static void hpt372_set_piomode(struct ata_port *ap, struct ata_device *adev)
-{
- hpt372_set_mode(ap, adev, adev->pio_mode);
-}
-
-/**
- * hpt372_set_dmamode - DMA timing setup
- * @ap: ATA interface
- * @adev: Device being configured
- *
- * Set up the channel for MWDMA or UDMA modes.
- */
-
-static void hpt372_set_dmamode(struct ata_port *ap, struct ata_device *adev)
-{
- hpt372_set_mode(ap, adev, adev->dma_mode);
-}
-
/**
* hpt37x_bmdma_stop - DMA engine stop
* @qc: ATA command
@@ -589,8 +541,8 @@ static struct ata_port_operations hpt370
.mode_filter = hpt370_filter,
.cable_detect = hpt37x_cable_detect,
- .set_piomode = hpt370_set_piomode,
- .set_dmamode = hpt370_set_dmamode,
+ .set_piomode = hpt37x_set_piomode,
+ .set_dmamode = hpt37x_set_dmamode,
.prereset = hpt37x_pre_reset,
};
@@ -604,8 +556,7 @@ static struct ata_port_operations hpt370
};
/*
- * Configuration for HPT371 and HPT302. Slightly different PIO and DMA
- * mode setting functionality.
+ * Configuration for HPT371 and HPT302.
*/
static struct ata_port_operations hpt302_port_ops = {
@@ -614,8 +565,8 @@ static struct ata_port_operations hpt302
.bmdma_stop = hpt37x_bmdma_stop,
.cable_detect = hpt37x_cable_detect,
- .set_piomode = hpt372_set_piomode,
- .set_dmamode = hpt372_set_dmamode,
+ .set_piomode = hpt37x_set_piomode,
+ .set_dmamode = hpt37x_set_dmamode,
.prereset = hpt37x_pre_reset,
};
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ata: pata_hpt37x: merge mode setting methods
2022-02-16 11:24 [PATCH] ata: pata_hpt37x: merge mode setting methods Sergey Shtylyov
@ 2022-02-16 11:29 ` Damien Le Moal
2022-02-17 9:49 ` Sergey Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Damien Le Moal @ 2022-02-16 11:29 UTC (permalink / raw)
To: Sergey Shtylyov, linux-ide
On 2/16/22 20:24, Sergey Shtylyov wrote:
> After commit e0afcf140e6e ("ata: pata_hpt37x: disable fast interrupts in
> prereset() method") HPT370's and HPT372+'s PIO/DMA mode setting functions
> have become identical -- merge them.
>
> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
>
> ---
> This patch is against the 'for-next' branch of Damien Le Moal's 'libata.git'
> repo.
>
> drivers/ata/pata_hpt37x.c | 71 +++++++---------------------------------------
> 1 file changed, 11 insertions(+), 60 deletions(-)
>
> Index: libata/drivers/ata/pata_hpt37x.c
> ===================================================================
> --- libata.orig/drivers/ata/pata_hpt37x.c
> +++ libata/drivers/ata/pata_hpt37x.c
> @@ -23,7 +23,7 @@
> #include <linux/libata.h>
>
> #define DRV_NAME "pata_hpt37x"
> -#define DRV_VERSION "0.6.24"
> +#define DRV_VERSION "0.6.25"
>
> struct hpt_clock {
> u8 xfer_speed;
> @@ -420,7 +420,7 @@ static int hpt37x_pre_reset(struct ata_l
> return ata_sff_prereset(link, deadline);
> }
>
> -static void hpt370_set_mode(struct ata_port *ap, struct ata_device *adev,
> +static void hpt37x_set_mode(struct ata_port *ap, struct ata_device *adev,
> u8 mode)
> {
> struct pci_dev *pdev = to_pci_dev(ap->host->dev);
> @@ -449,9 +449,9 @@ static void hpt370_set_mode(struct ata_p
> * Perform PIO mode setup.
> */
>
> -static void hpt370_set_piomode(struct ata_port *ap, struct ata_device *adev)
> +static void hpt37x_set_piomode(struct ata_port *ap, struct ata_device *adev)
> {
> - hpt370_set_mode(ap, adev, adev->pio_mode);
> + hpt37x_set_mode(ap, adev, adev->pio_mode);
> }
>
> /**
> @@ -462,9 +462,9 @@ static void hpt370_set_piomode(struct at
> * Set up the channel for MWDMA or UDMA modes.
> */
>
> -static void hpt370_set_dmamode(struct ata_port *ap, struct ata_device *adev)
> +static void hpt37x_set_dmamode(struct ata_port *ap, struct ata_device *adev)
> {
> - hpt370_set_mode(ap, adev, adev->dma_mode);
> + hpt37x_set_mode(ap, adev, adev->dma_mode);
> }
>
> /**
> @@ -504,54 +504,6 @@ static void hpt370_bmdma_stop(struct ata
> ata_bmdma_stop(qc);
> }
>
> -static void hpt372_set_mode(struct ata_port *ap, struct ata_device *adev,
> - u8 mode)
> -{
> - struct pci_dev *pdev = to_pci_dev(ap->host->dev);
> - int addr = 0x40 + 4 * (adev->devno + 2 * ap->port_no);
> - u32 reg, timing, mask;
> -
> - /* Determine timing mask and find matching mode entry */
> - if (mode < XFER_MW_DMA_0)
> - mask = 0xcfc3ffff;
> - else if (mode < XFER_UDMA_0)
> - mask = 0x31c001ff;
> - else
> - mask = 0x303c0000;
> -
> - timing = hpt37x_find_mode(ap, mode);
> -
> - pci_read_config_dword(pdev, addr, ®);
> - reg = (reg & ~mask) | (timing & mask);
> - pci_write_config_dword(pdev, addr, reg);
> -}
> -
> -/**
> - * hpt372_set_piomode - PIO setup
> - * @ap: ATA interface
> - * @adev: device on the interface
> - *
> - * Perform PIO mode setup.
> - */
> -
> -static void hpt372_set_piomode(struct ata_port *ap, struct ata_device *adev)
> -{
> - hpt372_set_mode(ap, adev, adev->pio_mode);
> -}
> -
> -/**
> - * hpt372_set_dmamode - DMA timing setup
> - * @ap: ATA interface
> - * @adev: Device being configured
> - *
> - * Set up the channel for MWDMA or UDMA modes.
> - */
> -
> -static void hpt372_set_dmamode(struct ata_port *ap, struct ata_device *adev)
> -{
> - hpt372_set_mode(ap, adev, adev->dma_mode);
> -}
> -
> /**
> * hpt37x_bmdma_stop - DMA engine stop
> * @qc: ATA command
> @@ -589,8 +541,8 @@ static struct ata_port_operations hpt370
>
> .mode_filter = hpt370_filter,
> .cable_detect = hpt37x_cable_detect,
> - .set_piomode = hpt370_set_piomode,
> - .set_dmamode = hpt370_set_dmamode,
> + .set_piomode = hpt37x_set_piomode,
> + .set_dmamode = hpt37x_set_dmamode,
> .prereset = hpt37x_pre_reset,
> };
>
> @@ -604,8 +556,7 @@ static struct ata_port_operations hpt370
> };
>
> /*
> - * Configuration for HPT371 and HPT302. Slightly different PIO and DMA
> - * mode setting functionality.
> + * Configuration for HPT371 and HPT302.
Shouldn't this be HPT372 ?
> */
>
> static struct ata_port_operations hpt302_port_ops = {
> @@ -614,8 +565,8 @@ static struct ata_port_operations hpt302
> .bmdma_stop = hpt37x_bmdma_stop,
>
> .cable_detect = hpt37x_cable_detect,
> - .set_piomode = hpt372_set_piomode,
> - .set_dmamode = hpt372_set_dmamode,
> + .set_piomode = hpt37x_set_piomode,
> + .set_dmamode = hpt37x_set_dmamode,
> .prereset = hpt37x_pre_reset,
> };
>
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ata: pata_hpt37x: merge mode setting methods
2022-02-16 11:29 ` Damien Le Moal
@ 2022-02-17 9:49 ` Sergey Shtylyov
2022-02-17 10:57 ` Damien Le Moal
0 siblings, 1 reply; 6+ messages in thread
From: Sergey Shtylyov @ 2022-02-17 9:49 UTC (permalink / raw)
To: Damien Le Moal, linux-ide
On 2/16/22 2:29 PM, Damien Le Moal wrote:
>> After commit e0afcf140e6e ("ata: pata_hpt37x: disable fast interrupts in
>> prereset() method") HPT370's and HPT372+'s PIO/DMA mode setting functions
>> have become identical -- merge them.
>>
>> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
>>
>> ---
>> This patch is against the 'for-next' branch of Damien Le Moal's 'libata.git'
>> repo.
>>
>> drivers/ata/pata_hpt37x.c | 71 +++++++---------------------------------------
>> 1 file changed, 11 insertions(+), 60 deletions(-)
>>
>> Index: libata/drivers/ata/pata_hpt37x.c
>> ===================================================================
>> --- libata.orig/drivers/ata/pata_hpt37x.c
>> +++ libata/drivers/ata/pata_hpt37x.c
[...]
>> @@ -604,8 +556,7 @@ static struct ata_port_operations hpt370
>> };
>>
>> /*
>> - * Configuration for HPT371 and HPT302. Slightly different PIO and DMA
>> - * mode setting functionality.
>> + * Configuration for HPT371 and HPT302.
>
> Shouldn't this be HPT372 ?
No, HPT372 ops are situated below -- they inherit from these.
[...]
MBR, Sergey
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ata: pata_hpt37x: merge mode setting methods
2022-02-17 9:49 ` Sergey Shtylyov
@ 2022-02-17 10:57 ` Damien Le Moal
2022-02-18 9:35 ` Sergey Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Damien Le Moal @ 2022-02-17 10:57 UTC (permalink / raw)
To: Sergey Shtylyov, linux-ide
On 2/17/22 18:49, Sergey Shtylyov wrote:
> On 2/16/22 2:29 PM, Damien Le Moal wrote:
>
>>> After commit e0afcf140e6e ("ata: pata_hpt37x: disable fast interrupts in
>>> prereset() method") HPT370's and HPT372+'s PIO/DMA mode setting functions
>>> have become identical -- merge them.
>>>
>>> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
>>>
>>> ---
>>> This patch is against the 'for-next' branch of Damien Le Moal's 'libata.git'
>>> repo.
>>>
>>> drivers/ata/pata_hpt37x.c | 71 +++++++---------------------------------------
>>> 1 file changed, 11 insertions(+), 60 deletions(-)
>>>
>>> Index: libata/drivers/ata/pata_hpt37x.c
>>> ===================================================================
>>> --- libata.orig/drivers/ata/pata_hpt37x.c
>>> +++ libata/drivers/ata/pata_hpt37x.c
> [...]
>>> @@ -604,8 +556,7 @@ static struct ata_port_operations hpt370
>>> };
>>>
>>> /*
>>> - * Configuration for HPT371 and HPT302. Slightly different PIO and DMA
>>> - * mode setting functionality.
>>> + * Configuration for HPT371 and HPT302.
>>
>> Shouldn't this be HPT372 ?
>
> No, HPT372 ops are situated below -- they inherit from these.
Yep. Got it (checked the code :)). All good.
>
> [...]
>
> MBR, Sergey
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ata: pata_hpt37x: merge mode setting methods
2022-02-17 10:57 ` Damien Le Moal
@ 2022-02-18 9:35 ` Sergey Shtylyov
2022-02-18 10:15 ` Sergey Shtylyov
0 siblings, 1 reply; 6+ messages in thread
From: Sergey Shtylyov @ 2022-02-18 9:35 UTC (permalink / raw)
To: Damien Le Moal, linux-ide
On 2/17/22 1:57 PM, Damien Le Moal wrote:
>>>> After commit e0afcf140e6e ("ata: pata_hpt37x: disable fast interrupts in
>>>> prereset() method") HPT370's and HPT372+'s PIO/DMA mode setting functions
>>>> have become identical -- merge them.
>>>>
>>>> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
>>>>
>>>> ---
>>>> This patch is against the 'for-next' branch of Damien Le Moal's 'libata.git'
>>>> repo.
>>>>
>>>> drivers/ata/pata_hpt37x.c | 71 +++++++---------------------------------------
>>>> 1 file changed, 11 insertions(+), 60 deletions(-)
>>>>
>>>> Index: libata/drivers/ata/pata_hpt37x.c
>>>> ===================================================================
>>>> --- libata.orig/drivers/ata/pata_hpt37x.c
>>>> +++ libata/drivers/ata/pata_hpt37x.c
>> [...]
>>>> @@ -604,8 +556,7 @@ static struct ata_port_operations hpt370
>>>> };
>>>>
>>>> /*
>>>> - * Configuration for HPT371 and HPT302. Slightly different PIO and DMA
>>>> - * mode setting functionality.
>>>> + * Configuration for HPT371 and HPT302.
>>>
>>> Shouldn't this be HPT372 ?
>>
>> No, HPT372 ops are situated below -- they inherit from these.
>
> Yep. Got it (checked the code :)). All good.
Not all good, unfortunately. :-/
Building with C=1 has shown:
drivers/ata/pata_hpt37x.c:453: warning: expecting prototype for hpt370_set_piomode(). Prototype was for hpt37x_set_piomode() instead
drivers/ata/pata_hpt37x.c:466: warning: expecting prototype for hpt370_set_dmamode(). Prototype was for hpt37x_set_dmamode() instead
i.e. I forgot to update the kernel-doc comments... Let me respin it!
>> [...]
MBR, Sergey
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] ata: pata_hpt37x: merge mode setting methods
2022-02-18 9:35 ` Sergey Shtylyov
@ 2022-02-18 10:15 ` Sergey Shtylyov
0 siblings, 0 replies; 6+ messages in thread
From: Sergey Shtylyov @ 2022-02-18 10:15 UTC (permalink / raw)
To: Damien Le Moal, linux-ide
On 2/18/22 12:35 PM, Sergey Shtylyov wrote:
>>>>> After commit e0afcf140e6e ("ata: pata_hpt37x: disable fast interrupts in
>>>>> prereset() method") HPT370's and HPT372+'s PIO/DMA mode setting functions
>>>>> have become identical -- merge them.
>>>>>
>>>>> Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
>>>>>
>>>>> ---
>>>>> This patch is against the 'for-next' branch of Damien Le Moal's 'libata.git'
>>>>> repo.
>>>>>
>>>>> drivers/ata/pata_hpt37x.c | 71 +++++++---------------------------------------
>>>>> 1 file changed, 11 insertions(+), 60 deletions(-)
>>>>>
>>>>> Index: libata/drivers/ata/pata_hpt37x.c
>>>>> ===================================================================
>>>>> --- libata.orig/drivers/ata/pata_hpt37x.c
>>>>> +++ libata/drivers/ata/pata_hpt37x.c
>>> [...]
>>>>> @@ -604,8 +556,7 @@ static struct ata_port_operations hpt370
>>>>> };
>>>>>
>>>>> /*
>>>>> - * Configuration for HPT371 and HPT302. Slightly different PIO and DMA
>>>>> - * mode setting functionality.
>>>>> + * Configuration for HPT371 and HPT302.
>>>>
>>>> Shouldn't this be HPT372 ?
>>>
>>> No, HPT372 ops are situated below -- they inherit from these.
>>
>> Yep. Got it (checked the code :)). All good.
>
> Not all good, unfortunately. :-/
> Building with C=1 has shown:
Actually, even with W=1...
> drivers/ata/pata_hpt37x.c:453: warning: expecting prototype for hpt370_set_piomode(). Prototype was for hpt37x_set_piomode() instead
> drivers/ata/pata_hpt37x.c:466: warning: expecting prototype for hpt370_set_dmamode(). Prototype was for hpt37x_set_dmamode() instead
>
> i.e. I forgot to update the kernel-doc comments... Let me respin it!
Resent now.
>>> [...]
MBR, Sergey
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-18 10:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-16 11:24 [PATCH] ata: pata_hpt37x: merge mode setting methods Sergey Shtylyov
2022-02-16 11:29 ` Damien Le Moal
2022-02-17 9:49 ` Sergey Shtylyov
2022-02-17 10:57 ` Damien Le Moal
2022-02-18 9:35 ` Sergey Shtylyov
2022-02-18 10:15 ` Sergey Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox