On 3/7/22 17:55, Ondrej Zary wrote:
>>> +module_param(probe, bool, 0644);
>>> +MODULE_PARM_DESC(probe, "Enable automatic device probing (0=off, 1=on [default])");
>>> +
>>> +static bool verbose;
>>> +module_param(verbose, bool, 0644);
>>> +MODULE_PARM_DESC(verbose, "Enable verbose messages (0=off [default], 1=on)");
>>
>> Is this really necessary ? pr_debug() and all ata_xxx_debug() functions
>> can be enabled dynamically.
>
> The verbose messages are for adapter chip detection. That happens before the
> ata host is registered.
Sure. But you can still use pr_debug(). So instead of
if (verbose)
dev_info();
simply use:
dev_dbg()
And these calls can be enabled with the standard dynamic debug control.
>
>>> +
>>> +#define DISCONNECT_TIMEOUT (HZ / 10)
>>> +
>>> +static void pi_connect(struct pi_adapter *pi)
>>> +{
>>> + del_timer_sync(&pi->timer);
>>> + if (pi->claimed)
>>> + return;
>>
>> Nit: I would reverse the condition to avoid the return. Or add a block
>> line to separate the following hunk. Better readability this way, I think.
>>
>>> + pi->claimed = 1;
>>> + parport_claim_or_block(pi->pardev);
>>> + pi->proto->connect(pi);
>>> +}
>>> +
>>> +static void pi_disconnect_later(struct pi_adapter *pi)
>>> +{
>>> + mod_timer(&pi->timer, jiffies + DISCONNECT_TIMEOUT);
>>> +}
>>
>> Is this really needed ? Not sure it helps in any way. At least the name
>> should be changed to reflect what this does. May be something like
>> pi_start_disconnect_timeout() ?
>
> Disconnect needs to happen after end of an operation so the parport is freed
> for device(s) (like a printer) connected to pass-through port of a paride
> device. There could be even multiple paride devices chained on one parport.
>
> Disconnecting immediately at the end of each function does not work
> (probably breaks the protocol?)
>
> The old high-level drivers (pd, pf...) did connect and disconnect manually
> on each operation (command or data transfer) but it does not seem to be
> possible with libata.
I am not questioning how you handle the disconnect. I was only
commenting that the inline function may not be that usefull and you
could simply directly use the mod_timer() calls directly.
or
rename pi_disconnect_later() to something that better explains what the
function does.
>
>>> +
>>> +static void pi_disconnect_timer(struct timer_list *t)
>>> +{
>>> + struct pi_adapter *pi = from_timer(pi, t, timer);
>>> +
>>> + if (!pi->claimed)
>>> + return;
>>
>> A blank line here would be nice for readability.
>>
>>> + pi->proto->disconnect(pi);
>>> + parport_release(pi->pardev);
>>> + pi->claimed = 0;
>>> +}
>>> +
>>> +/* functions taken from libata-sff.c and converted from direct port I/O */
>>> +static unsigned int pata_parport_devchk(struct ata_port *ap, unsigned int device)
>>
>> Should this be a bool function ?
>
> I don't know. It's copied from libata-sff.c
>
>>> +{
>>> + struct pi_adapter *pi = ap->host->private_data;
>>> + u8 nsect, lbal;
>>> +
>>> + ap->ops->sff_dev_select(ap, device);
>>> +
>>> + pi_connect(pi);
>>> + pi->proto->write_regr(pi, 0, ATA_REG_NSECT, 0x55);
>>> + pi->proto->write_regr(pi, 0, ATA_REG_LBAL, 0xaa);
>>> +
>>> + pi->proto->write_regr(pi, 0, ATA_REG_NSECT, 0xaa);
>>> + pi->proto->write_regr(pi, 0, ATA_REG_LBAL, 0x55);
>>> +
>>> + pi->proto->write_regr(pi, 0, ATA_REG_NSECT, 055);
>>> + pi->proto->write_regr(pi, 0, ATA_REG_LBAL, 0xaa);
>>> +
>>> + nsect = pi->proto->read_regr(pi, 0, ATA_REG_NSECT);
>>> + lbal = pi->proto->read_regr(pi, 0, ATA_REG_LBAL);
>>> + pi_disconnect_later(pi);
>>> +
>>> + if ((nsect == 0x55) && (lbal == 0xaa))
>>> + return 1; /* we found a device */
>>> +
>>> + return 0; /* nothing found */
>>> +}
>>> +
>>> +static int pata_parport_bus_softreset(struct ata_port *ap, unsigned int devmask,
>>> + unsigned long deadline)
>>> +{
>>> + struct pi_adapter *pi = ap->host->private_data;
>>> +
>>> + pi_connect(pi);
>>> + /* software reset. causes dev0 to be selected */
>>> + pi->proto->write_regr(pi, 1, 6, ap->ctl);
>>> + udelay(20); /* FIXME: flush */
>>
>> Then please fix it.
>
> I don't know what that means. It's copied from libata-sff.c
OK. Will have a look there too.
>
>>> + pi->proto->write_regr(pi, 1, 6, ap->ctl | ATA_SRST);
>>> + udelay(20); /* FIXME: flush */
>>
>> Here too.
>>
>>> + pi->proto->write_regr(pi, 1, 6, ap->ctl);
>>> + ap->last_ctl = ap->ctl;
>>> + pi_disconnect_later(pi);
>>> +
>>> + /* wait the port to become ready */
>>> + return ata_sff_wait_after_reset(&ap->link, devmask, deadline);
>>> +}
>>> +
>>> +static int pata_parport_softreset(struct ata_link *link, unsigned int *classes,
>>> + unsigned long deadline)
>>> +{
>>> + struct ata_port *ap = link->ap;
>>> + unsigned int slave_possible = ap->flags & ATA_FLAG_SLAVE_POSS;
>>> + unsigned int devmask = 0;
>>> + int rc;
>>> + u8 err;
>>> +
>>> + /* determine if device 0/1 are present */
>>> + if (pata_parport_devchk(ap, 0))
>>> + devmask |= (1 << 0);
>>> + if (slave_possible && pata_parport_devchk(ap, 1))
>>> + devmask |= (1 << 1);
>>> +
>>> + /* select device 0 again */
>>> + ap->ops->sff_dev_select(ap, 0);
>>> +
>>> + /* issue bus reset */
>>> + rc = pata_parport_bus_softreset(ap, devmask, deadline);
>>> + /* if link is occupied, -ENODEV too is an error */
>>
>> Please merge this comment with the one above. That will make the code
>> more readable (I know this is the style used by many drivers, but let's
>> not repeat the weird style :)).
>>
>>> + if (rc && (rc != -ENODEV || sata_scr_valid(link))) {
>>> + ata_link_err(link, "SRST failed (errno=%d)\n", rc);
>>> + return rc;
>>> + }
>>> +
>>> + /* determine by signature whether we have ATA or ATAPI devices */
>>> + classes[0] = ata_sff_dev_classify(&link->device[0],
>>> + devmask & (1 << 0), &err);
>>> + if (slave_possible && err != 0x81)
>>> + classes[1] = ata_sff_dev_classify(&link->device[1],
>>> + devmask & (1 << 1), &err);
>>> +
>>> + return 0;
>>> +}
>>> +
>>> +static u8 pata_parport_check_status(struct ata_port *ap)
>>> +{
>>> + u8 status;
>>> + struct pi_adapter *pi = ap->host->private_data;
>>> +
>>> + pi_connect(pi);
>>> + status = pi->proto->read_regr(pi, 0, ATA_REG_STATUS);
>>> + pi_disconnect_later(pi);
>>> +
>>> + return status;
>>> +}
>>> +
>>> +static u8 pata_parport_check_altstatus(struct ata_port *ap)
>>> +{
>>> + u8 altstatus;
>>> + struct pi_adapter *pi = ap->host->private_data;
>>> +
>>> + pi_connect(pi);
>>> + altstatus = pi->proto->read_regr(pi, 1, 6);
>>> + pi_disconnect_later(pi);
>>> +
>>> + return altstatus;
>>> +}
>>> +
>>> +static void pata_parport_dev_select(struct ata_port *ap, unsigned int device)
>>> +{
>>> + struct pi_adapter *pi = ap->host->private_data;
>>> + u8 tmp;
>>> +
>>> + pi_connect(pi);
>>> + if (device == 0)
>>> + tmp = ATA_DEVICE_OBS;
>>> + else
>>> + tmp = ATA_DEVICE_OBS | ATA_DEV1;
>>> +
>>> + pi->proto->write_regr(pi, 0, ATA_REG_DEVICE, tmp);
>>> + pi_disconnect_later(pi);
>>> + ata_sff_pause(ap); /* needed; also flushes, for mmio */
>>
>> The comment does not parse... Why is it needed ?
>> And pleasde move the comment above the call, with a blank line
>> separating it from the previous lines.
>
> I don't know. It's copied from libata-sff.c
Drop the comment then.
>
>>> +}
>>> +
>>> +static void pata_parport_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
>>> +{
>>> + struct pi_adapter *pi = ap->host->private_data;
>>> + unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
>>> +
>>> + pi_connect(pi);
>>> + if (tf->ctl != ap->last_ctl) {
>>> + pi->proto->write_regr(pi, 1, 6, tf->ctl);
>>> + ap->last_ctl = tf->ctl;
>>> + ata_wait_idle(ap);
>>> + }
>>> +
>>> + if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
>>> + pi->proto->write_regr(pi, 0, ATA_REG_FEATURE, tf->hob_feature);
>>> + pi->proto->write_regr(pi, 0, ATA_REG_NSECT, tf->hob_nsect);
>>> + pi->proto->write_regr(pi, 0, ATA_REG_LBAL, tf->hob_lbal);
>>> + pi->proto->write_regr(pi, 0, ATA_REG_LBAM, tf->hob_lbam);
>>> + pi->proto->write_regr(pi, 0, ATA_REG_LBAH, tf->hob_lbah);
>>> + }
>>> +
>>> + if (is_addr) {
>>
>> Move this if above the previous one. Doing so, you can remove the need
>> for is_addr var and simplify the previous if condition.
>>
>> That said, many pata drivers check that flag but it is always set by
>> libata core. So checking it seems useless. Need to dig into this.
>
> It's copied from libata-sff.c which is almost libata core.
Yes. Saw the same pattern in different drivers. Need to figure out what
is going on here. That flag really seem totally useless. Will check.
Keep the flag use for now, but at least rewrite as suggested to avoid
the need for that is_addr variable.
>>> + struct timer_list timer; /* disconnect timer */
>>> +};
>>> +
>>> +/* registers are addressed as (cont,regr)
>>> + * cont: 0 for command register file, 1 for control register(s)
>>> + * regr: 0-7 for register number.
>>> + */
>>> +
>>> +/* macros and functions exported to the protocol modules */
>>> +#define delay_p (pi->delay ? udelay(pi->delay) : (void)0)
>>> +#define out_p(offs, byte) do { outb(byte, pi->port + offs); delay_p; } while (0)
>>> +#define in_p(offs) (delay_p, inb(pi->port + offs))
>>> +
>>> +#define w0(byte) out_p(0, byte)
>>> +#define r0() (in_p(0) & 0xff)
>>> +#define w1(byte) out_p(1, byte)
>>> +#define r1() (in_p(1) & 0xff)
>>> +#define w2(byte) out_p(2, byte)
>>> +#define r2() (in_p(2) & 0xff)
>>> +#define w3(byte) out_p(3, byte)
>>> +#define w4(byte) out_p(4, byte)
>>> +#define r4() (in_p(4) & 0xff)
>>> +#define w4w(data) do { outw(data, pi->port + 4); delay_p; } while (0)
>>> +#define w4l(data) do { outl(data, pi->port + 4); delay_p; } while (0)
>>> +#define r4w() (delay_p, inw(pi->port + 4) & 0xffff)
>>> +#define r4l() (delay_p, inl(pi->port + 4) & 0xffffffff)
>>
>> Why not align this with the others ?
>
> It's aligned properly in the file, only looks bad in a diff.
>
OK.
>>> +
>>> +/**
>>> + * module_pata_parport_driver() - Helper macro for registering a pata_parport driver
>>> + * @__pi_protocol: pi_protocol struct
>>> + *
>>> + * Helper macro for pata_parport drivers which do not do anything special in module
>>> + * init/exit. This eliminates a lot of boilerplate. Each module may only
>>> + * use this macro once, and calling it replaces module_init() and module_exit()
>>> + */
>>> +#define module_pata_parport_driver(__pi_protocol) \
>>> + module_driver(__pi_protocol, pata_parport_register_driver, pata_parport_unregister_driver)
>>
>> Make this a static inline ?
>
> It's a macro that expands to other macro (defined in include/linux/device/driver.h)
> that expands to __init and __exit functions, module_init() and
> module_exit() so we can use:
>
> module_pata_parport_driver(on26);
>
> instead of:
>
> static int __init on26_init(void)
> {
> return pata_parport_register_driver(&on26);
> }
>
> static void __exit on26_exit(void)
> {
> pata_parport_unregister_driver(&on26);
> }
>
> module_init(on26_init)
> module_exit(on26_exit)
OK.
--
Damien Le Moal
Western Digital Research
