Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <e7112674-05e2-93cd-b8f9-3e31f173238d@amd.com>
Date:   Tue, 1 Feb 2022 14:32:45 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Subject: Re: [PATCH v4 2/4] Watchdog: sp5100_tco: Refactor MMIO base address
 initialization
Content-Language: en-US
From:   Terry Bowman <Terry.Bowman@amd.com>
To:     Guenter Roeck <linux@roeck-us.net>, linux-watchdog@vger.kernel.org,
        jdelvare@suse.com, linux-i2c@vger.kernel.org, wsa@kernel.org,
        andy.shevchenko@gmail.com, rafael.j.wysocki@intel.com
Cc:     linux-kernel@vger.kernel.org, wim@linux-watchdog.org,
        rrichter@amd.com, thomas.lendacky@amd.com, sudheesh.mavila@amd.com,
        Nehal-bakulchandra.Shah@amd.com, Basavaraj.Natikar@amd.com,
        Shyam-sundar.S-k@amd.com, Mario.Limonciello@amd.com
References: <20220130191225.303115-1-terry.bowman@amd.com>
 <20220130191225.303115-3-terry.bowman@amd.com>
 <ecf12beb-a03b-2aec-1dc4-8183a8b6daa6@roeck-us.net>
 <c1d121f7-f482-7913-eced-4fbef962656d@amd.com>
In-Reply-To: <c1d121f7-f482-7913-eced-4fbef962656d@amd.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MGVhRCt1aGxIOFphR2ZUcWlwSTVQa1plWkROYkNPUGxOVGh1SU1aM2hhaWpG?=
 =?utf-8?B?N0VzeXdsK0tMSjIvcGwwL01oSW0relczNmM0SW80OTJJazhQNEtNdUhIQm9Q?=
 =?utf-8?B?cUc3MHI2cFMwZkszWWdUMUVCNlYzbXF5ZzNra2hRMllQd1puWEdkY0F6eTVz?=
 =?utf-8?B?Q0dzbmcya1pRQmlVZFdIREZvdGEvVFMyZ3ZuT3pxakFlL2RQNm44RnVkZjk2?=
 =?utf-8?B?MTJyUEpaQ3RwTzJkRTZ0am9JS24wQjNWdGl2TVJhQklqeVhtYmxOQmI3K2Vs?=
 =?utf-8?B?VjFZNXpUVjdVMXNsc3ZIelgxQ25YcG1Pay9kcDV1YjlxNERRYXJHQVR2SEEy?=
 =?utf-8?B?UlBNa1JaRmVwemVCTGpnenZxTi92cmUrbFM0d01mUzBTckt0emVEem0vWkRQ?=
 =?utf-8?B?dVNsb1NXYW50aUZISjYvRjBONmRvc3dQbklwQW9DQVFtdndESzI3UjkvVkRn?=
 =?utf-8?B?WElyKzhKam01eHY3aE52aWx0R05LaTE0Skh2c0VEU1dtZXVQclJxclRsczBa?=
 =?utf-8?B?cEFVU0ZJeU0xYm1KYlJONkl0bUE5ZVh0eFpmM0d1WmpZRkVxeVovRnBaR2JI?=
 =?utf-8?B?SHo4VitwbTRZaCs4MWswSW00TnBXdC9RYXJaRUF0eitKM2p1NFMyenVXQ0Fs?=
 =?utf-8?B?eW1KSE5aTVZ4VmVKRWw0REh0ZDhORG1DTXhiUzlXWEUzTzg5N01lRlc1RjJE?=
 =?utf-8?B?TUU2QUpuN0ZYNElUZytCN210S0VwR2VXaUJDRjdHbGhyTmFrWEUrdENRWTQx?=
 =?utf-8?B?OWo5MG12U2l0VEhCdGs4TG5FSThzNUhmUXVocmF6WXUxRDB3K3RUVWh5dmNV?=
 =?utf-8?B?azhyTlZFbUc2NnBxcm8xK2hjU1JnaUFDVHk2ZDlKeUxnQk8vWkdta09sdWU4?=
 =?utf-8?B?NWQwdTE3bVRQK3dLRnY2TFpLRkFZclVmdUpRaFBEMHp1bW15UE5wcnBDektG?=
 =?utf-8?B?K2ZJUWpabXk0bDVaMVg0VE83cGlIdGd3Zmlid2RkU1lhaDV2YjNLRXp1a0ti?=
 =?utf-8?B?UXN5a2ExQitkMkJ1Qkd3VkFYd0J3LzBLR1pRQlhmZFFBc0lwU3BUSVpYWDRz?=
 =?utf-8?B?ek00a21IUHkzVlVhUDZxVUdtQ3FhL09Eb1hiTnhUczc1Q1V5dmZvWFp3Mk9Z?=
 =?utf-8?B?U3BERC84dE5WQWVEOUFYOXgzWFd4SWR4L2JhODUxVnE4ZksxOStVSytrYTlv?=
 =?utf-8?B?YkJhd290OEIrWnZuTFJMMlpEa0lxcGxjZlFVSkozeENYTWNtTlZoaCtIV1F2?=
 =?utf-8?B?WW5iMmRsWWVZWGVaRGVBbU1pYmxxRnJVbmNvNDcrNDA5M3RZbDh3bzlDbUJK?=
 =?utf-8?B?Q2dhaGN5WS80UlV6SGx3VGdiUmdIbzREcUpBY1lFNHB0RGtISzloSW9uaWwz?=
 =?utf-8?B?Yi84R0hyOWN6QUhEaWVNZnduY2ZZZkNCS1JpMGVoQkJtYUlrdEkrTWxISm9U?=
 =?utf-8?B?bWRtOENXNlVjbEtuRW40VFl3VHM4M2ozeW01V1NXK09kR2o1VDRiMXBGNkdW?=
 =?utf-8?B?TGswSXQxZWdQRkhxYTVrV0tPMERhSTNBS05PSUZVTlF1Q29Dd0RsaGs0bThQ?=
 =?utf-8?B?VDFveFpINlVxMXZ5THVVbFdDRFUreFpOTWgzSHJFUktLaFEzYXFTazQyM1lh?=
 =?utf-8?B?TVJRSENWSWxnVEdhYXFQbEZuZlNCaU4yZWFwdml6WmxwZVQ1ZlVaUlZOK3ZG?=
 =?utf-8?B?c1NPam9Ra0VDVXlVMkFUd3BBaWtjM0VqWWJpdzM0ZlR6TW1JdndzbC9ZNnBw?=
 =?utf-8?B?dnRvSUxZNmlwOVU3MDVsbkl1SE5pbUIrd1FmL09leTBuNlhXL1dnMUFLbFVx?=
 =?utf-8?B?RXh6cEY3L1NXdTJMMm12MU96dnJpaTg4eWtwdVlBVnhnaERBcUdPWVBRaHA3?=
 =?utf-8?B?ZzdBUmNhVFpSMzl3S0NOMnJBSWY2STluVHRvQzQxT3dhcEZoVGh0dTA3bG9J?=
 =?utf-8?B?YXU0YUJBNS9kSWNrT20zenJnOE96Y093RDNMNnRyWG5MUU1EWldjeWV6TWV5?=
 =?utf-8?B?WlpvVFhjVTllem8xNXdvVDFxRlRpZ3I1OUJmYU05SC8rL0h0dU1DeHZlU0tm?=
 =?utf-8?B?U3pEdEIreHQyTHFsUHdWbnRieS9yOEl2YUFQc1k3dGd6cnNjclNNQ0E3NHZy?=
 =?utf-8?B?UXNERzNHU29keG5KT201MytrN0JYM2UyWTFXaDZLbVNPd2V0cHNHSU9HamN6?=
 =?utf-8?Q?pAUzIy2q8dk7XapDRPrdr0k=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aa2c3955-6490-44f0-9e0c-08d9e5c202a4
X-MS-Exchange-CrossTenant-AuthSource: CH0PR12MB5346.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 20:32:48.2426
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: aS7FqP7tdVMMJo+2qMGzAk/dLiPVTp+qqmU7amyPTFCx8EtBDPgW9OQEvrhUnnCk5hHa8r841mZrPS9gBYp16w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5358
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 2/1/22 10:46, Terry Bowman wrote:
> 
> 
> On 2/1/22 09:31, Guenter Roeck wrote:
>> On 1/30/22 11:12, Terry Bowman wrote:
>>> Combine MMIO base address and alternate base address detection. Combine
>>> based on layout type. This will simplify the function by eliminating
>>> a switch case.
>>>
>>> Move existing request/release code into functions. This currently only
>>> supports port I/O request/release. The move into a separate function
>>> will make it ready for adding MMIO region support.
>>>
>>> Co-developed-by: Robert Richter <rrichter@amd.com>
>>> Signed-off-by: Robert Richter <rrichter@amd.com>
>>> Signed-off-by: Terry Bowman <terry.bowman@amd.com>
>>> Tested-by: Jean Delvare <jdelvare@suse.de>
>>> Reviewed-by: Jean Delvare <jdelvare@suse.de>
>>> ---
>>>   drivers/watchdog/sp5100_tco.c | 155 ++++++++++++++++++----------------
>>>   drivers/watchdog/sp5100_tco.h |   1 +
>>>   2 files changed, 82 insertions(+), 74 deletions(-)
>>>
>>> diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
>>> index b365bbc9ac36..16e122d5045e 100644
>>> --- a/drivers/watchdog/sp5100_tco.c
>>> +++ b/drivers/watchdog/sp5100_tco.c
>>> @@ -223,6 +223,55 @@ static u32 sp5100_tco_read_pm_reg32(u8 index)
>>>       return val;
>>>   }
>>>   +static u32 sp5100_tco_request_region(struct device *dev,
>>> +                     u32 mmio_addr,
>>> +                     const char *dev_name)
>>> +{
>>> +    if (!devm_request_mem_region(dev, mmio_addr, SP5100_WDT_MEM_MAP_SIZE,
>>> +                     dev_name)) {
>>> +        dev_dbg(dev, "MMIO address 0x%08x already in use\n", mmio_addr);
>>> +        return 0;
>>> +    }
>>> +
>>> +    return mmio_addr;
>>> +}
>>> +
>>> +static u32 sp5100_tco_prepare_base(struct sp5100_tco *tco,
>>> +                   u32 mmio_addr,
>>> +                   u32 alt_mmio_addr,
>>> +                   const char *dev_name)
>>> +{
>>> +    struct device *dev = tco->wdd.parent;
>>> +
>>> +    dev_dbg(dev, "Got 0x%08x from SBResource_MMIO register\n", mmio_addr);
>>> +
>>> +    if (!mmio_addr && !alt_mmio_addr)
>>> +        return -ENODEV;
>>> +
>>> +    /* Check for MMIO address and alternate MMIO address conflicts */
>>> +    if (mmio_addr)
>>> +        mmio_addr = sp5100_tco_request_region(dev, mmio_addr, dev_name);
>>> +
>>> +    if (!mmio_addr && alt_mmio_addr)
>>> +        mmio_addr = sp5100_tco_request_region(dev, alt_mmio_addr, dev_name);
>>> +
>>> +    if (!mmio_addr) {
>>> +        dev_err(dev, "Failed to reserve MMIO or alternate MMIO region\n");
>>> +        return -EBUSY;
>>> +    }
>>> +
>>> +    tco->tcobase = devm_ioremap(dev, mmio_addr, SP5100_WDT_MEM_MAP_SIZE);
>>> +    if (!tco->tcobase) {
>>> +        dev_err(dev, "MMIO address 0x%08x failed mapping\n", mmio_addr);
>>> +        devm_release_mem_region(dev, mmio_addr, SP5100_WDT_MEM_MAP_SIZE);
>>> +        return -ENOMEM;
>>> +    }
>>> +
>>> +    dev_info(dev, "Using 0x%08x for watchdog MMIO address\n", tco->tcobase);
>>> +
>>
>> I know this is the same as the old code, but I think it would make sense to change
>> this as suggested by 0-day and use %px instead.
>>
>> Thanks,
>> Guenter
> 
> 
Hi Guenter,

This line was changed in v4 and should be reverted. It should be using the mmio_addr
physical address with '0x%08x' formatting instead of tco->tcobase. This would be:

dev_info(dev, "Using 0x%08x for watchdog MMIO address\n", mmio_addr);

The dmesg then provides:

[    5.972921] sp5100_tco: SP5100/SB800 TCO WatchDog Timer Driver
[    5.978238] sp5100-tco sp5100-tco: Using 0xfeb00000 for watchdog MMIO address
[    5.978252] sp5100-tco sp5100-tco: Watchdog hardware is disabled

Do your agree?

Regards,
Terry