From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=pass header.i=@linaro.org header.s=google header.b=DubzrGnf;
 spf=pass (domain: linaro.org, ip: 209.85.166.67, mailfrom: ard.biesheuvel@linaro.org)
Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67])
 by groups.io with SMTP; Wed, 29 May 2019 06:15:03 -0700
Received: by mail-io1-f67.google.com with SMTP id p2so1777035iol.2
        for <devel@edk2.groups.io>; Wed, 29 May 2019 06:15:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=linaro.org; s=google;
        h=mime-version:references:in-reply-to:from:date:message-id:subject:to
         :cc;
        bh=yUaSrbDns8tZCumlR3Q3xUeNEarvpBtxoW4mLGRDQNY=;
        b=DubzrGnfVMxrGt2V+YNrhfirXzwN9tVSkKNgRUzR3FbHkLzErPHATG1rsKZHHiRSRP
         W4pUjFNmP3DHVhSaBvzU2TG9oORtyaWUv8SM0MJTJfl6fgVhQVcUx4HZL7pbuEMdoypJ
         D30PEa/VWJHezKK0N+wPlUCb3oGjp6twobhiVuxPi8pIF3/hzb4pN7WSQx3kHdVFgq1o
         RMT8San4EKFmT5CoqtGgWx9i4dGIF77AopYJx/YvK4zk6zfLrRWXO3VhAafDZl9oXzSO
         qW3lHLbTMVJoExaT0Lhj+UsN9eqe6+EdTrGe7oD6ViRclenxW5YjsWk2yoIF33OGfFU4
         QDSQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=yUaSrbDns8tZCumlR3Q3xUeNEarvpBtxoW4mLGRDQNY=;
        b=nTv2hSLi/5W5HLdPRJpLabLmX9hTjBwLms7RpCHZgO+qVkebC/GLw4UMqCvU/dvAj5
         VeIr9uZ9liQAdLVdf6z6gyOVaaKq7POauXd6RGR5l6kzhx9dux9GMHeSJP+aCAaN+K7e
         w+PcMhEjEqD61Apig5co5m6wX17UiGzPKA1QhE07WLVKie6wbClHtGW9/DfO4kxUjTtM
         vhm3N9qnvS8NTvJVPt91kOJ7YPcB9dHBMt3dO8w4uufNlIAN2knWMV2sA4Grj0Vtlf9b
         go+2GS1FGjyPyvalT0eVwsGtke9N8H2BOg3viG/OQxjx3RPimwRGKS5CfdWXmVoa8V1I
         hP9w==
X-Gm-Message-State: APjAAAVu2T6842ovsHwGDunjjCnt032OMnvocY4vpnXTA0z1HRObFx/G
	xFmAwu2mLbuKQVj3FQv18OW8yq2HO01We2LXxWJ9cw==
X-Google-Smtp-Source: APXvYqyqjkg9EzvgBQYku6ggXcX6B8F/a3rd6DIshD3w6HBVMnzyoYkx21outI1AuTeYmgCgJBQI2Fax/juREXdVyws=
X-Received: by 2002:a5d:9402:: with SMTP id v2mr3085487ion.128.1559135702330;
 Wed, 29 May 2019 06:15:02 -0700 (PDT)
MIME-Version: 1.0
References: <20190529125021.28308-1-ard.biesheuvel@linaro.org>
 <20190529125021.28308-4-ard.biesheuvel@linaro.org> <20190529130652.pkfzeo5xbcotypaf@bivouac.eciton.net>
In-Reply-To: <20190529130652.pkfzeo5xbcotypaf@bivouac.eciton.net>
From: "Ard Biesheuvel" <ard.biesheuvel@linaro.org>
Date: Wed, 29 May 2019 15:14:48 +0200
Message-ID: <CAKv+Gu_cVK3gKmY7tH-7JC-pe3eOFO2XEC9KiM0XFVtCpxVWng@mail.gmail.com>
Subject: Re: [edk2-devel] [PATCH edk2-platforms 3/5] Platform/Secure96Dxe: redefine LS connector CS as platform property
To: Leif Lindholm <leif.lindholm@linaro.org>
Cc: edk2-devel-groups-io <devel@edk2.groups.io>, Masahisa Kojima <masahisa.kojima@linaro.org>
Content-Type: text/plain; charset="UTF-8"

On Wed, 29 May 2019 at 15:06, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Wed, May 29, 2019 at 02:50:19PM +0200, Ard Biesheuvel wrote:
> > As opposed to the Secure96's I2C peripherals, whose bus addresses are
> > properties of the peripherals themselves, the SPI CS address of the
> > TPM is a property of the platform that incorporates the LS connector.
> >
> > So tweak the macros that emit the CS values and related properties
> > to put it under the control of the platform that incorporates the
> > driver.
> >
> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > ---
> >  Platform/96Boards/Secure96Dxe/Secure96.dts |  2 +-
> >  Platform/96Boards/Secure96Dxe/Secure96.h   | 11 ++++++++---
> >  2 files changed, 9 insertions(+), 4 deletions(-)
> >
> > diff --git a/Platform/96Boards/Secure96Dxe/Secure96.dts b/Platform/96Boards/Secure96Dxe/Secure96.dts
> > index d066fcb1933c..0d7d9b3900a4 100644
> > --- a/Platform/96Boards/Secure96Dxe/Secure96.dts
> > +++ b/Platform/96Boards/Secure96Dxe/Secure96.dts
> > @@ -39,7 +39,7 @@
> >          __overlay__ {
> >              INFINEON_SLB9670_DT_NODENAME {
> >                  compatible = "infineon,slb9670";
> > -                reg = <INFINEON_SLB9670_SPI_CS>;
> > +                reg = <SECURE96_SPI0_CS>;
> >                  spi-max-frequency = <22500000>;
> >              };
> >          };
> > diff --git a/Platform/96Boards/Secure96Dxe/Secure96.h b/Platform/96Boards/Secure96Dxe/Secure96.h
> > index c34fc5eea046..1d8bf4159209 100644
> > --- a/Platform/96Boards/Secure96Dxe/Secure96.h
> > +++ b/Platform/96Boards/Secure96Dxe/Secure96.h
> > @@ -1,6 +1,6 @@
> >  /** @file
> >
> > -  Copyright (c) 2018, Linaro, Ltd. All rights reserved.<BR>
> > +  Copyright (c) 2018-2019, Linaro, Ltd. All rights reserved.<BR>
> >
> >    SPDX-License-Identifier: BSD-2-Clause-Patent
> >  **/
> > @@ -8,14 +8,19 @@
> >  #ifndef _SECURE96_H_
> >  #define _SECURE96_H_
> >
> > +#define __CONCAT(a,b)                   a ## b
> > +
>
> Urgh. We badly need to properly add some official macros for this.
> You could possibly use __CONCATENATE from Base.h.
>

OK, I'll use that instead.

> For new macros, we really should avoid leading _.
>

True.