Hello,
Thanks for your review and feedback!
On Fri, 22 Apr 2016 13:59:36 -0400, Tejun Heo wrote:
> On Fri, Apr 22, 2016 at 04:32:37PM +0200, Thomas Petazzoni wrote:
> > @@ -1714,10 +1714,11 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
> >
> > for (i = 0; i < host->n_ports; i++) {
> > struct ata_port *ap = host->ports[i];
> > + unsigned int offset =
> > + hpriv->port_offset + ap->port_no * hpriv->port_length;
> >
> > ata_port_pbar_desc(ap, ahci_pci_bar, -1, "abar");
> > - ata_port_pbar_desc(ap, ahci_pci_bar,
> > - 0x100 + ap->port_no * 0x80, "port");
> > + ata_port_pbar_desc(ap, ahci_pci_bar, offset, "port");
>
> Doesn't this just affect ahci_platform?
No, because the main source of the problem is the ahci_port_base()
function, which is used all over the place in libahci.c (which is used
by all AHCI drivers, not only ahci_platform drivers). And this
ahci_port_base() currently hardcodes the 0x100 / 0x80 values:
429 static inline void __iomem *__ahci_port_base(struct ata_host *host,
430 unsigned int port_no)
431 {
432 struct ahci_host_priv *hpriv = host->private_data;
433 void __iomem *mmio = hpriv->mmio;
434
435 return mmio + 0x100 + (port_no * 0x80);
436 }
437
438 static inline void __iomem *ahci_port_base(struct ata_port *ap)
439 {
440 return __ahci_port_base(ap->host, ap->port_no);
441 }
In essence all what we want to change is the __ahci_port_base()
function so that it doesn't use hardcoded values.
> Why is ahci_init_one() being updated?
The idea why ahci_init_one() was updated is also to remove hardcoded
values. Once we have the correct values in the ahci_host_priv, why not
use them everywhere instead of keeping some hardcoded values?
> Also, who's setting port_offet and port_length for non-platform ahci
> drivers?
This is obviously a mistake in my proposal. And the non-platform
drivers are allocating manually their ahci_host_priv structure, which
makes it a bit difficult/annoying to initialize those new fields.
I see a few possibilities:
1/ Adjust all the drivers allocating manually an ahci_host_priv
structure, and make sure they initialize the fields to their default
values.
2/ Add a new helper function that allows to allocate the
ahci_host_priv structure and initialize it with sane default values,
and use this helper in all drivers.
3/ Add a flag in ahci_host_priv that tells whether non-standard port
offset/length are to be used. This is the most minimal solution,
but also maybe not the nicest one.
> If this needs to be configurable, wouldn't it be better to just let it
> be specified per port?
How could it be per-port? The base for a port is calculated as:
base + <port_offset> + (port_no * <port_length>)
So, port_offset is clearly not per-port, there's only one of them. And
if we were to make <port_length> a per-port property, then the formula
would become a lot more complicated: we would have to iterate over each
port, and see what is the length of the register area for each of them,
to calculate the base address of the registers for the n-th port. This
is clearly a complexity that is not needed for my use case: all ports
have the same register area length, it's just that this length is
non-standard.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
