On Thu, Nov 29, 2012 at 12:21:04PM +0200, Terje Bergström wrote:
> On 28.11.2012 23:23, Thierry Reding wrote:
> > This could be problematic. Since drivers/video and drivers/gpu/drm are
> > separate trees, this would entail a continuous burden on keeping both
> > trees synchronized. While I realize that eventually it might be better
> > to put the host1x driver in a separate place to accomodate for its use
> > by other subsystems, I'm not sure moving it here right away is the best
> > approach.
>
> I understand your point, but I hope also that we'd end up with something
> that can be used as basis for the downstream kernel to migrate to
> upstream stack.
>
> The key point here is to make the API between nvhost and tegradrm as
> small and robust to changes as possible.
I agree. But I also fear that there will be changes eventually and
having both go in via different tree requires those trees to be merged
in a specific order to avoid breakage should the API change. This will
be particularly ugly in linux-next.
That's why I explicitly proposed to take this into drivers/gpu/drm/tegra
for the time being, until we can be reasonably sure that the API is
fixed. Then I'm fine with moving it wherever seems the best fit. Even
then there might be the occasional dependency, but they should get fewer
and fewer as the code matures.
> >> +struct nvhost_syncpt_ops {
> >> + void (*reset)(struct nvhost_syncpt *, u32 id);
> >> + void (*reset_wait_base)(struct nvhost_syncpt *, u32 id);
> >> + void (*read_wait_base)(struct nvhost_syncpt *, u32 id);
> >> + u32 (*update_min)(struct nvhost_syncpt *, u32 id);
> >> + void (*cpu_incr)(struct nvhost_syncpt *, u32 id);
> >> + void (*debug)(struct nvhost_syncpt *);
> >> + const char * (*name)(struct nvhost_syncpt *, u32 id);
> >> +};
> >
> > Why are these even defined as ops structure? Tegra20 and Tegra30 seem to
> > be compatible when it comes to handling syncpoints. I thought they would
> > even be compatible in all other aspects as well, so why even have this?
>
> Tegra20 and Tegra30 are compatible, but future chips are not. I was
> hoping we would be ready in upstream kernel for future chips.
I think we should ignore that problem for now. Generally planning for
any possible combination of incompatibilities leads to overgeneralized
designs that require precisely these kinds of indirections.
Once some documentation for Tegra 40 materializes we can start thinking
about how to encapsulate the incompatible code.
> >> +#define syncpt_op() (nvhost_get_chip_ops()->syncpt)
> >
> > You really shouldn't be doing this, but rather use explicit accesses for
> > these structures. If you're design doesn't scatter these definitions
> > across several files then it isn't difficult to obtain the correct
> > pointers and you don't need these "shortcuts".
>
> Do you mean that I would move the ops to be part of f.ex. nvhost_syncpt
> or nvhost_intr structs?
Not quite. What I'm saying is that unless there is a reason to
encapsulate the functions into an ops structure (for instance because of
incompatibilities across chip generations) they shouldn't be pointers in
a struct at all.
For that matter I don't think you need the nvhost_syncpt and nvhost_intr
structures either.
> >> +bool host1x_powered(struct platform_device *dev)
> >> +{
> > [...]
> >> +}
> >> +EXPORT_SYMBOL(host1x_powered);
> >> +
> >> +void host1x_busy(struct platform_device *dev)
> >> +{
> > [...]
> >> +}
> >> +EXPORT_SYMBOL(host1x_busy);
> >> +
> >> +void host1x_idle(struct platform_device *dev)
> >> +{
> > [...]
> >> +}
> >> +EXPORT_SYMBOL(host1x_idle);
> >
> > These look like a reimplementation of the runtime power-management
> > framework.
>
> Yes, we at some point tried to move to use runtime PM. The first attempt
> was thwarted by runtime PM and system suspend conflicting with each
> other. I believe this is pretty much fixed in later versions of kernel.
>
> Also, the problem was that runtime PM doesn't support multiple power
> states. In downstream kernel, we support clock gating and power gating.
> When we moved to runtime PM and implemented power gating on top of that,
> we ended up with more code than just using the current ACM code.
>
> I have a developer starting to look into how we could take runtime PM
> again into use with proper power gating support. It'll take a while to
> get that right. It might be best to rip the dynamic power management out
> from this patch set, and introduce it later when we have a proper
> runtime PM solution.
Okay, sounds like a plan. Even if it turns out that the current runtime
PM implementation doesn't provide every functionality that you need, we
should try to get these changes into the existing frameworks instead of
copying large chunks of code.
> >> +static void nvhost_free_resources(struct nvhost_master *host)
> >> +{
> >> +}
> >
> > This should be removed since it's empty.
>
> True. I wonder how that happened - there was content since recently, but
> I guess I deleted the code without noticing that the function needs to
> go, too.
I noticed that it was filled with content in one of the subsequent
patches. Depending on how this gets merged eventually you could postpone
adding the function until the later patch. But perhaps once the code has
been properly reviewed we can just squash the patches again. We'll see.
> > Also you should be using platform_get_irq() for interrupts. Furthermore
> > the host1x DT node (and the TRM) name the interrupts "syncpt" and
> > "general", so maybe those would be more useful variable names than
> > "intr0" and "intr1".
> >
> > But since you don't use them anyway they shouldn't be part of this
> > patch.
>
> True. I might also as well delete the general interrupt altogether, as
> we don't use it for any real purpose.
I think it might still be useful for diagnostics. It seems to be used
when writes time out. That could still be helpful information when
debugging problems.
> >> + for (i = 0; i < pdata->num_clks; i++)
> >> + clk_prepare_enable(pdata->clk[i]);
> >> + nvhost_syncpt_reset(&host->syncpt);
> >> + for (i = 0; i < pdata->num_clks; i++)
> >> + clk_disable_unprepare(pdata->clk[i]);
> >
> > Stephen already hinted at this when discussing the AUXDATA. You should
> > explicitly request the clocks.
>
> I'm not too happy about that idea. The clock management code is generic
> for all modules, and that's why it's driven by a data structure. Now
> Stephen and you ask me to unroll the loops and make copies of the code
> to facilitate different modules and different SoCs.
Making this generic for all modules may not be what we want as it
doesn't allow devices to handle things themselves if necessary. Clock
management is just part of the boiler plate that every driver is
supposed to cope with. Also the number of clocks is usually not higher
than 2 or 3, so the pain is manageable. =)
Furthermore doing this in loops may not work for all modules. Some may
require additional delays between enabling the clocks, others may be
able to selectively disable one clock but not the other(s).
> >> +static inline void *nvhost_get_private_data(struct platform_device *_dev)
> >> +{
> >> + struct nvhost_device_data *pdata =
> >> + (struct nvhost_device_data *)platform_get_drvdata(_dev);
> >> + WARN_ON(!pdata);
> >> + return (pdata && pdata->private_data) ? pdata->private_data : NULL;
> >> +}
> >> +
> >> +static inline void nvhost_set_private_data(struct platform_device *_dev,
> >> + void *priv_data)
> >> +{
> >> + struct nvhost_device_data *pdata =
> >> + (struct nvhost_device_data *)platform_get_drvdata(_dev);
> >> + WARN_ON(!pdata);
> >> + if (pdata)
> >> + pdata->private_data = priv_data;
> >> +}
> >
> > You should need none of these. Instead put all the data you need into
> > you struct host1x and associate that with the platform device using
> > platform_set_drvdata().
>
> I need to actually find a way to do this for both host1x itself, and the
> 2D module. But as said, I'll try to remove the auxdata and come up with
> something better.
The existing host1x and DRM code could serve as an example since I
explicitly wrote them to behave properly.
> >> +static inline
> >> +struct nvhost_master *nvhost_get_host(struct platform_device *_dev)
> >> +{
> >> + struct platform_device *pdev;
> >> +
> >> + if (_dev->dev.parent) {
> >> + pdev = to_platform_device(_dev->dev.parent);
> >> + return nvhost_get_private_data(pdev);
> >> + } else
> >> + return nvhost_get_private_data(_dev);
> >> +}
> >> +
> >> +static inline
> >> +struct platform_device *nvhost_get_parent(struct platform_device *_dev)
> >> +{
> >> + return _dev->dev.parent ? to_platform_device(_dev->dev.parent) : NULL;
> >> +}
> >
> > These don't seem to be used.
>
> nvhost_get_host() is used in a subsequent patch, but getting parent
> doesn't seem to be.
Again, if you look at the existing tegra-drm code, the client modules
already use something a bit more explicit to obtain a reference to the
host1x:
struct host1x *host1x = dev_get_drvdata(pdev->dev.parent);
The good thing about it is that it very clearly says where the host1x
pointer should be coming from. Explicitness is good.
> > Usually you don't keep separate variables for subregions. This can
> > equally well be done with just adding a corresponding offset.
>
> Hmm, ok, I could do that, but it just sounds logical to have only one
> piece of code that finds the sync reg base. I don't really understand
> why it needs to be duplicate for every access.
You wouldn't actually be duplicating it. Rather you'd just add another
offset. But I commented on this more explicitly in a reply to one of the
other patches.
> >> +static void host1x_syncpt_debug(struct nvhost_syncpt *sp)
> >> +{
> >> + u32 i;
> >> + for (i = 0; i < nvhost_syncpt_nb_pts(sp); i++) {
> >> + u32 max = nvhost_syncpt_read_max(sp, i);
> >> + u32 min = nvhost_syncpt_update_min(sp, i);
> >> + if (!max && !min)
> >> + continue;
> >> + dev_info(&syncpt_to_dev(sp)->dev->dev,
> >> + "id %d (%s) min %d max %d\n",
> >> + i, syncpt_op().name(sp, i),
> >> + min, max);
> >> +
> >> + }
> >> +
> >> + for (i = 0; i < nvhost_syncpt_nb_bases(sp); i++) {
> >> + u32 base_val;
> >> + host1x_syncpt_read_wait_base(sp, i);
> >> + base_val = sp->base_val[i];
> >> + if (base_val)
> >> + dev_info(&syncpt_to_dev(sp)->dev->dev,
> >> + "waitbase id %d val %d\n",
> >> + i, base_val);
> >> +
> >> + }
> >> +}
> >
> > This should probably be integrated with debugfs.
>
> I could move this to debug.c, but it's debugging aid when a command
> stream is misbehaving and it spews this to UART when sync point wait is
> timing out. So not debugfs stuff.
Okay, in that case it should stay in. Perhaps convert dev_info() to
dev_dbg(). Perhaps wrapping it in some #ifdef CONFIG_TEGRA_HOST1X_DEBUG
guards would also be useful. Maybe not.
> >> diff --git a/drivers/video/tegra/host/host1x/hw_host1x01_sync.h b/drivers/video/tegra/host/host1x/hw_host1x01_sync.h
> >
> > Autogenerated files are generally not acceptable. And I already
> > mentioned before that you should be using #define instead of static
> > inline functions for register and bit definitions.
>
> What's the root cause for autogenerated files not being acceptable? I'm
> autogenerating them from definitions I get from hardware, which makes
> the results reliable.
The problem is not with autogenerated files in general. The means by
which they are generated are less important. However, autogenerated
files often contain a lot of unneeded definitions and contain things
such as "autogenerated - do not edit" lines.
So generally if you generate the content using some scripts to make sure
it corresponds to what engineering gave you, that's okay as long as you
make sure it has the correct form and doesn't contain any cruft.
> I like static inline because I get the benefit of compiler type
> checking, and gcov shows me which register definitions have been used in
> different tests.
Type checking shouldn't be necessary for simple defines. And I wasn't
aware that you could get the Linux kernel to write out data to be fed to
gcov.
> #defines are always messy and I pretty much hate them. But if the
> general request is to use #define's, even though I don't agree, I can
> accommodate. It's simple to write a sed script to do the conversion.
There are a lot of opportunities to abuse #defines but they are harmless
for register definitions. The Linux kernel is full of them and I haven't
yet seen any code that uses static inline functions for this purpose.
What you need to consider as well is that many people that work with the
Linux kernel expect code to be in a certain style. Register accesses of
the form
writel(value, base + OFFSET);
are very common and expected to look a certain way, so if you write code
that doesn't comply with these guidelines you make it extra hard for
people to read the code. And that'll cost extra time, which people don't
usually have in excess.
> >> +/* Displays the current value of the sync point via sysfs */
> >> +static ssize_t syncpt_min_show(struct kobject *kobj,
> >> + struct kobj_attribute *attr, char *buf)
> >> +{
> >> + struct nvhost_syncpt_attr *syncpt_attr =
> >> + container_of(attr, struct nvhost_syncpt_attr, attr);
> >> +
> >> + return snprintf(buf, PAGE_SIZE, "%u",
> >> + nvhost_syncpt_read(&syncpt_attr->host->syncpt,
> >> + syncpt_attr->id));
> >> +}
> >> +
> >> +static ssize_t syncpt_max_show(struct kobject *kobj,
> >> + struct kobj_attribute *attr, char *buf)
> >> +{
> >> + struct nvhost_syncpt_attr *syncpt_attr =
> >> + container_of(attr, struct nvhost_syncpt_attr, attr);
> >> +
> >> + return snprintf(buf, PAGE_SIZE, "%u",
> >> + nvhost_syncpt_read_max(&syncpt_attr->host->syncpt,
> >> + syncpt_attr->id));
> >> +}
> >
> > This looks like it belongs in debugfs.
>
> This is actually the only interface to read the max value to user space,
> which can be useful for doing some comparisons that take wrapping into
> account. But we could just add IOCTLs and remove the sysfs entries.
Maybe you can explain the usefulness of this some more. Why would it be
easier to look at them in sysfs than in debugfs? You could be providing
a simple list of syncpoints along with min/max, name, requested status,
etc. in debugfs and it should be as easy to parse for both humans and
machines as sysfs. I don't think IOCTLs would be any gain as they tend
to have higher ABI stability requirements than debugfs (which doesn't
have very strong requirements) or sysfs (which is often considered as a
public ABI as well and therefore needs to be stable).
> >> diff --git a/include/linux/nvhost.h b/include/linux/nvhost.h
> > [...]
> >> +struct host1x_device_info {
> >> + int nb_channels; /* host1x: num channels supported */
> >> + int nb_pts; /* host1x: num syncpoints supported */
> >> + int nb_bases; /* host1x: num syncpoints supported */
> >> + u32 client_managed; /* host1x: client managed syncpts */
> >> + int nb_mlocks; /* host1x: number of mlocks */
> >> + const char **syncpt_names; /* names of sync points */
> >> +};
> >> +
> >> +struct nvhost_device_data {
> >> + int version; /* ip version number of device */
> >> + int id; /* Separates clients of same hw */
> >> + int index; /* Hardware channel number */
> >> + void __iomem *aperture; /* Iomem mapped to kernel */
> >> +
> >> + u32 syncpts; /* Bitfield of sync points used */
> >> + u32 modulemutexes; /* Bit field of module mutexes */
> >> +
> >> + u32 class; /* Device class */
> >> + bool serialize; /* Serialize submits in the channel */
> >> +
> >> + int powergate_ids[NVHOST_MODULE_MAX_POWERGATE_IDS];
> >> + bool can_powergate; /* True if module can be power gated */
> >> + int clockgate_delay;/* Delay before clock gated */
> >> + int powergate_delay;/* Delay before power gated */
> >> + struct nvhost_clock clocks[NVHOST_MODULE_MAX_CLOCKS];/* Clock names */
> >> +
> >> + struct delayed_work powerstate_down;/* Power state management */
> >> + int num_clks; /* Number of clocks opened for dev */
> >> + struct clk *clk[NVHOST_MODULE_MAX_CLOCKS];
> >> + struct mutex lock; /* Power management lock */
> >> + int powerstate; /* Current power state */
> >> + int refcount; /* Number of tasks active */
> >> + wait_queue_head_t idle_wq; /* Work queue for idle */
> >> +
> >> + struct nvhost_channel *channel; /* Channel assigned for the module */
> >> + struct kobject *power_kobj; /* kobj to hold power sysfs entries */
> >> + struct nvhost_device_power_attr *power_attrib; /* sysfs attributes */
> >> + struct dentry *debugfs; /* debugfs directory */
> >> +
> >> + void *private_data; /* private platform data */
> >> + struct platform_device *pdev; /* owner platform_device */
> >> +
> >> + /* Finalize power on. Can be used for context restore. */
> >> + void (*finalize_poweron)(struct platform_device *dev);
> >> +
> >> + /* Device is busy. */
> >> + void (*busy)(struct platform_device *);
> >> +
> >> + /* Device is idle. */
> >> + void (*idle)(struct platform_device *);
> >> +
> >> + /* Device is going to be suspended */
> >> + void (*suspend_ndev)(struct platform_device *);
> >> +
> >> + /* Device is initialized */
> >> + void (*init)(struct platform_device *dev);
> >> +
> >> + /* Device is de-initialized. */
> >> + void (*deinit)(struct platform_device *dev);
> >> +
> >> + /* Preparing for power off. Used for context save. */
> >> + int (*prepare_poweroff)(struct platform_device *dev);
> >> +
> >> + /* Clock gating callbacks */
> >> + int (*prepare_clockoff)(struct platform_device *dev);
> >> + void (*finalize_clockon)(struct platform_device *dev);
> >> +};
> >
> > A lot of this can be removed if you use existing infrastructure and
> > simplify the design a bit. Most of it can probably move into the main
> > struct host1x to avoid needless indirections that make the code hard to
> > follow and maintain.
>
> Actually, this struct is generic for host1x and host1x clients, so they
> cannot be moved to host1x. I do also realize that I'm not using them in
> the patch sets I sent for 2D.
I've said this before, and I think that this tries to be overly generic.
Display controllers for instance work quite well without an attached
nvhost_channel.
Thierry
Attachment:
pgpfo2y9L96oK.pgp
Description: PGP signature
